diff --git a/hosts b/hosts
index 8a49330..83361dd 100644
--- a/hosts
+++ b/hosts
@@ -1,10 +1,10 @@
 [gateways]
-barnitz ansible_ssh_host=195.201.117.146 external_ipv4=195.201.117.146 external_interface=eth0 ffsh_ipv4_space=10.144.48.0/20 ffsh_map_name=GW_Beste ffsh_ipv6_address=fddf:0bf7:80::48:1 ffsh_ipv4_address=10.144.48.1 dhcp_range=10.144.48.2-10.144.63.254 ffsh_map_mac=00:5b:27:80:00:48 ffsh_bat_mac=00:5b:27:81:00:48 owner=ulf
+barnitz ansible_ssh_host=195.201.117.146 external_ipv4=195.201.117.146 external_interface=eth0 ffsh_ipv4_space=10.144.48.0/20 ffsh_map_name=GW_Barnitz ffsh_ipv6_address=fddf:0bf7:80::48:1 ffsh_ipv4_address=10.144.48.1 dhcp_range=10.144.48.2-10.144.63.254 ffsh_map_mac=00:5b:27:80:00:48 ffsh_bat_mac=00:5b:27:81:00:48 owner=ulf
 beste ansible_ssh_host=88.99.35.208 external_ipv4=88.99.35.208 external_interface=eth0 ffsh_ipv4_space=10.144.64.0/20 ffsh_map_name=GW_Beste ffsh_ipv6_address=fddf:0bf7:80::64:1 ffsh_ipv4_address=10.144.64.1 dhcp_range=10.144.64.2-10.144.79.254 ffsh_map_mac=00:5b:27:80:00:64 ffsh_bat_mac=00:5b:27:81:00:64 owner=ulf
 brunsbach ansible_ssh_host=37.221.192.238 external_ipv4=37.221.192.238 external_interface=eth0 ffsh_ipv4_space=10.144.96.0/20 ffsh_map_name=GW_Brunsbach ffsh_ipv6_address=fddf:0bf7:80::96:1 ffsh_ipv4_address=10.144.96.1 dhcp_range=10.144.96.2-10.144.111.254 ffsh_map_mac=00:5b:27:80:00:96 ffsh_bat_mac=00:5b:27:81:00:96 owner=benjamin
-heilsau ansible_ssh_host=95.216.157.253 external_ipv4=95.216.157.253 external_interface=eth0 ffsh_ipv4_space=10.144.112.0/20 ffsh_map_name=GW_Beste ffsh_ipv6_address=fddf:0bf7:80::112:1 ffsh_ipv4_address=10.144.112.1 dhcp_range=10.144.112.2-10.144.127.254 ffsh_map_mac=00:5b:27:80:00:112 ffsh_bat_mac=00:5b:27:81:00:112 owner=ulf
-sylsbek ansible_ssh_host=195.128.103.225 external_ipv4=195.128.103.225 external_interface=eth0 ffsh_ipv4_space=10.144.192.0/20 ffsh_map_name=GW_Beste ffsh_ipv6_address=fddf:0bf7:80::192:1 ffsh_ipv4_address=10.144.192.1 dhcp_range=10.144.192.2-10.144.207.254 ffsh_map_mac=00:5b:27:80:00:192 ffsh_bat_mac=00:5b:27:81:00:192 owner=ulf
-trave ansible_ssh_host=88.99.86.15 external_ipv4=88.99.86.15 external_interface=eth0 ffsh_ipv4_space=10.144.208.0/20 ffsh_map_name=GW_Beste ffsh_ipv6_address=fddf:0bf7:80::208:1 ffsh_ipv4_address=10.144.208.1 dhcp_range=10.144.208.2-10.144.223.254 ffsh_map_mac=00:5b:27:80:00:208 ffsh_bat_mac=00:5b:27:81:00:208 owner=ulf
+heilsau ansible_ssh_host=95.216.157.253 external_ipv4=95.216.157.253 external_interface=eth0 ffsh_ipv4_space=10.144.112.0/20 ffsh_map_name=GW_Heilsau ffsh_ipv6_address=fddf:0bf7:80::112:1 ffsh_ipv4_address=10.144.112.1 dhcp_range=10.144.112.2-10.144.127.254 ffsh_map_mac=00:5b:27:80:00:112 ffsh_bat_mac=00:5b:27:81:00:112 owner=ulf
+sylsbek ansible_ssh_host=195.128.103.225 external_ipv4=195.128.103.225 external_interface=eth0 ffsh_ipv4_space=10.144.192.0/20 ffsh_map_name=GW_Sylsbek ffsh_ipv6_address=fddf:0bf7:80::192:1 ffsh_ipv4_address=10.144.192.1 dhcp_range=10.144.192.2-10.144.207.254 ffsh_map_mac=00:5b:27:80:00:192 ffsh_bat_mac=00:5b:27:81:00:192 owner=ulf
+trave ansible_ssh_host=88.99.86.15 external_ipv4=88.99.86.15 external_interface=eth0 ffsh_ipv4_space=10.144.208.0/20 ffsh_map_name=GW_Trave ffsh_ipv6_address=fddf:0bf7:80::208:1 ffsh_ipv4_address=10.144.208.1 dhcp_range=10.144.208.2-10.144.223.254 ffsh_map_mac=00:5b:27:80:00:208 ffsh_bat_mac=00:5b:27:81:00:208 owner=ulf
 
 [gateways:vars]
 ansible_user=root
diff --git a/setup.yml b/setup.yml
index 9202ef1..00c05d7 100644
--- a/setup.yml
+++ b/setup.yml
@@ -9,14 +9,14 @@
   roles:
     - { role: network, tags: "network"}
     - { role: fail2ban, tags: "fail2ban"}
-    - { role: batman, tags: "batman-adv", batman_version: "2021.1"}
+    - { role: batman, tags: "batman-adv", batman_version: "2021.2"}
     - { role: fastd, tags: "fastd", fastd_target: "fastd 21"}
     - { role: radvd, tags: "radvd"}
     - { role: dhcp, tags: "isc-dhcp4-server"}
     - { role: bind, tags: "dns"}
     - { role: respondd, tags: "respondd"}
     - { role: prometheus, tags: "node_exporter", node_exporter_version: "1.2.2"}
-    - { role: tools, tags: "admin-tools", batman_version: "2021.1"}
+    - { role: tools, tags: "admin-tools", batman_version: "2021.2"}
     - { role: motd, tags: "motd"}
     - { role: ohmyzsh, tags: "oh-my-zsh"}
     - { role: ssh, tags: "ssh keys", login_user: 'root'}