diff --git a/bundles/wireguard/metadata.py b/bundles/wireguard/metadata.py
index e2a191e..f614d71 100644
--- a/bundles/wireguard/metadata.py
+++ b/bundles/wireguard/metadata.py
@@ -35,6 +35,9 @@ def s2s_peer_specific(metadata):
                     'id': repo.get_node(peer).metadata.get(f'id'),
                     'ip': repo.get_node(peer).metadata.get(f'wireguard/my_ip'),
                     'endpoint': f'{repo.get_node(peer).hostname}:51820',
+                    'route': [
+                        str(ip_interface(repo.get_node(peer).metadata.get(f'wireguard/my_ip')).network),
+                    ],
                 }
                     for peer in metadata.get('wireguard/peers')
             },
@@ -52,10 +55,10 @@ def client_peer_specific(metadata):
                 client: {
                     'id': client,
                     'route': [
-                        '172.30.0.0/24',
+                        str(ip_interface(conf['ip']).network),
                     ]
                 }
-                    for client in metadata.get('wireguard/clients')
+                    for client, conf in metadata.get('wireguard/clients').items()
             },
         },
     }
diff --git a/nodes/home.server.py b/nodes/home.server.py
index 25196d2..b899b24 100644
--- a/nodes/home.server.py
+++ b/nodes/home.server.py
@@ -62,7 +62,6 @@
             'peers': {
                 'htz.mails': {
                     'route': [
-                        '172.30.0.0/24',
                         '10.0.10.0/24',
                         '10.0.11.0/24',
                         '10.0.20.0/24',
diff --git a/nodes/htz.mails.py b/nodes/htz.mails.py
index 87536f7..22d4003 100644
--- a/nodes/htz.mails.py
+++ b/nodes/htz.mails.py
@@ -162,13 +162,13 @@
             },
             'clients': {
                 'macbook': {
-                    'ip': '172.30.0.100/24',
+                    'ip': '172.30.0.100/32',
                 },
                 'phone': {
-                    'ip': '172.30.0.101/24',
+                    'ip': '172.30.0.101/32',
                 },
                 'ipad': {
-                    'ip': '172.30.0.102/24',
+                    'ip': '172.30.0.102/32',
                 },
             },
         },
diff --git a/nodes/netcup.secondary.py b/nodes/netcup.secondary.py
index 3bd3622..d0c35b8 100644
--- a/nodes/netcup.secondary.py
+++ b/nodes/netcup.secondary.py
@@ -35,7 +35,6 @@
             'peers': {
                 'htz.mails': {
                     'route': [
-                        '172.30.0.0/24',
                         '10.0.0.0/24',
                         '10.0.2.0/24',
                         '10.0.9.0/24',
diff --git a/nodes/wb.offsite-backups.py b/nodes/wb.offsite-backups.py
index 621c11c..5e77f70 100644
--- a/nodes/wb.offsite-backups.py
+++ b/nodes/wb.offsite-backups.py
@@ -26,7 +26,6 @@
             'peers': {
                 'htz.mails': {
                     'route': [
-                        '172.30.0.0/24',
                         '10.0.0.0/24',
                         '10.0.2.0/24',
                         '10.0.9.0/24',