diff --git a/host_vars/gw12.regensburg.freifunk.net b/host_vars/gw12.regensburg.freifunk.net
new file mode 100644
index 0000000..fb9e7a1
--- /dev/null
+++ b/host_vars/gw12.regensburg.freifunk.net
@@ -0,0 +1,15 @@
+---
+
+batman_ipv4: 10.90.32.12/19
+batman_ipv6: fdef:f10f:1337:cafe::12/64
+batman_algo: BATMAN_IV
+global_ipv6: 2a02:958:0:101::12/64
+nextnode4: 10.90.32.1
+nextnode6: fdef:f10f:1337:cafe::1
+mtu: 1312
+
+fastd_port: 10010
+
+gateway_id: 12
+
+site_code: ffrgb_cty
diff --git a/host_vars/gw22.regensburg.freifunk.net b/host_vars/gw22.regensburg.freifunk.net
new file mode 100644
index 0000000..12b049e
--- /dev/null
+++ b/host_vars/gw22.regensburg.freifunk.net
@@ -0,0 +1,15 @@
+---
+
+batman_ipv4: 10.90.64.22/19
+batman_ipv6: fdef:f20f:1337:cafe::22/64
+batman_algo: BATMAN_IV
+global_ipv6: 2a02:958:0:102::22/64
+nextnode4: 10.90.64.1
+nextnode6: fdef:f20f:1337:cafe::1
+mtu: 1312
+
+fastd_port: 10020
+
+gateway_id: 22
+
+site_code: ffrgb_uml
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 49cbb55..15ad164 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -4,6 +4,7 @@
   apt: name={{ item }}
   with_items:
   - dnsutils
+  - git
   - htop
   - less
   - net-tools
diff --git a/site.yml b/site.yml
index 2fec8f9..954d5bb 100644
--- a/site.yml
+++ b/site.yml
@@ -9,7 +9,7 @@
   - node_exporter
 
 - name: Setup gateway servers
-  hosts: [gw11.regensburg.freifunk.net, gw21.regensburg.freifunk.net, gw31.regensburg.freifunk.net]
+  hosts: [gw11.regensburg.freifunk.net, gw21.regensburg.freifunk.net, gw31.regensburg.freifunk.net, gw12.regensburg.freifunk.net, gw22.regensburg.freifunk.net]
   roles:
   - gw-admin-ssh-keys
   - arp-cache