diff --git a/roles/network-batman/templates/batman.j2 b/roles/network-batman/templates/batman.j2
index 3f6435c..40accb2 100644
--- a/roles/network-batman/templates/batman.j2
+++ b/roles/network-batman/templates/batman.j2
@@ -7,7 +7,7 @@
 auto {{ item.id }}bat
 iface {{ item.id }}bat
     hwaddress {{ mac | hwaddr('linux') }}
-    batman-ifaces {{ item.id }}0 {% for instance in item.fastd.nodes.instances %}{{ item.id }}vpn-{{ instance.mtu }}{% if not loop.last %} {% endif %}{% endfor %} {% for instance in item.fastd.backbone.instances %}{{ item.id }}igvpn-{{ instance.mtu }}{% if not loop.last %} {% endif %}{% endfor %}
+    batman-ifaces {{ item.id }}0 {% if ffmwu_server_type == 'gateway' %}{% for instance in item.fastd.nodes.instances %}{{ item.id }}vpn-{{ instance.mtu }}{% if not loop.last %} {% endif %}{% endfor %} {% endif %}{% for instance in item.fastd.backbone.instances %}{{ item.id }}igvpn-{{ instance.mtu }}{% if not loop.last %} {% endif %}{% endfor %}
     batman-hop-penalty {{ item.batman.hop_penalty }}
     post-up /usr/sbin/batctl -m $IFACE it {{ item.batman.it }}
     post-up /usr/sbin/batctl -m $IFACE mm {{ item.batman.mm }}
diff --git a/roles/network-fastd/tasks/main.yml b/roles/network-fastd/tasks/main.yml
index 1069ebc..b07e130 100644
--- a/roles/network-fastd/tasks/main.yml
+++ b/roles/network-fastd/tasks/main.yml
@@ -1,5 +1,6 @@
 ---
 - name: create fastd mesh interfaces
+  when: ffmwu_server_type == "gateway"
   template:
     src: fastd-mesh.j2
     dest: "/etc/network/interfaces.d/{{ item.0.id }}vpn-{{ item.1.mtu }}"