diff --git a/roles/interfaces/templates/mesh.conf.j2 b/roles/interfaces/templates/mesh.conf.j2
index 3438536..7f2e962 100644
--- a/roles/interfaces/templates/mesh.conf.j2
+++ b/roles/interfaces/templates/mesh.conf.j2
@@ -21,14 +21,15 @@ iface bat-{{ site_code }}
 	hwaddress	f2:00:90:00:{{ gateway_id }}:20
 	mtu		1500
 	#
-	batman-gw-mode		server
 	batman-hop-penalty	5
 	batman-ifaces		dmy-{{ site_code }}
 	batman-ifaces-ignore-regex	.*_.*
 	batman-multicast-mode	disabled
 	batman-routing-algo	{{ batman_algo }}
 	#
+	# batman-gw-mode option seems non reliable
 	post-up		/usr/sbin/batctl -m bat-{{ site_code }} it 5000
+	post-up		/usr/sbin/batctl -m bat-{{ site_code }} gw server
 	post-up		echo 2 > /sys/class/net/bat-{{ site_code }}/brport/multicast_router