diff --git a/README.md b/README.md
index c620a68..7fdbe10 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@ Ansible Freifunk Regensburg
 
 ## Requirements
 
+The python package netaddr is required on the host running ansible.
 The vault password must be stored in `.vault_pass`.
 
 
diff --git a/host_vars/gw11.regensburg.freifunk.net b/host_vars/gw11.regensburg.freifunk.net
index 2337160..1621c46 100644
--- a/host_vars/gw11.regensburg.freifunk.net
+++ b/host_vars/gw11.regensburg.freifunk.net
@@ -1,6 +1,8 @@
 ---
 
-batman_ipv4:
-  address: 10.90.0.11
+batman_ipv4: 10.90.0.11/19
+batman_ipv6: fdef:1337:f00f:cafe::11/64
 
-site_code: ffrgb_stadt
+gateway_id: 11
+
+site_code: ffr_stadt
diff --git a/host_vars/gw21.regensburg.freifunk.net b/host_vars/gw21.regensburg.freifunk.net
index 5d4d1a5..efcd8fa 100644
--- a/host_vars/gw21.regensburg.freifunk.net
+++ b/host_vars/gw21.regensburg.freifunk.net
@@ -1,6 +1,8 @@
 ---
 
-batman_ipv4:
-  address: 10.90.32.21
+batman_ipv4: 10.90.32.21/19
+batman_ipv6: fdef:1337:f10f:cafe::21/64
 
-site_code: ffrgb_umland
+gateway_id: 21
+
+site_code: ffr_umland
diff --git a/host_vars/gw31.regensburg.freifunk.net b/host_vars/gw31.regensburg.freifunk.net
index 9ff9a20..6f0ce77 100644
--- a/host_vars/gw31.regensburg.freifunk.net
+++ b/host_vars/gw31.regensburg.freifunk.net
@@ -1,6 +1,8 @@
 ---
 
-batman_ipv4:
-  address: 10.90.192.31
+batman_ipv4: 10.90.192.31/19
+batman_ipv6: fdef:1337:f60f:cafe::31/64
 
-site_code: ffrgb_test
+gateway_id: 31
+
+site_code: ffr_test
diff --git a/roles/dns/templates/recursor.conf.j2 b/roles/dns/templates/recursor.conf.j2
index 9d89025..75ced73 100644
--- a/roles/dns/templates/recursor.conf.j2
+++ b/roles/dns/templates/recursor.conf.j2
@@ -19,7 +19,7 @@ dnssec=off
 #################################
 # local-address IP addresses to listen on, separated by spaces or commas. Also accepts ports.
 #
-local-address=127.0.0.1,{{ batman_ipv4.address }}
+local-address=127.0.0.1,{{ batman_ipv4 | ipaddr('address') }}
 
 #################################
 # local-port    port to listen on