diff --git a/nodes/home.router.py b/nodes/home.router.py
index ade9d0b..8a3e22a 100644
--- a/nodes/home.router.py
+++ b/nodes/home.router.py
@@ -9,6 +9,7 @@
     ],
     'bundles': [
         'kea-dhcpd',
+        'wireguard',
     ],
     'metadata': {
         'id': '1d6a43e5-858c-42f9-9c40-ab63d61c787c',
@@ -60,5 +61,18 @@
                 },
             },
         },
+        'wireguard': {
+            'my_ip': '172.30.0.2/32',
+            's2s': {
+                'htz.mails': {
+                    'allowed_ips': [
+                        '10.0.10.0/24',
+                        '10.0.10.0/24',
+                        '192.168.179.0/24',
+                        '10.0.227.0/24', # mseibert.freescout
+                    ],
+                },
+            },
+        },
     },
 }
diff --git a/nodes/home.server.py b/nodes/home.server.py
index 48270e9..ae15217 100644
--- a/nodes/home.server.py
+++ b/nodes/home.server.py
@@ -33,7 +33,6 @@
         'twitch-clip-download',
         'raspberrymatic-cert',
         'tasmota-charge',
-        'wireguard',
         'wol-waker',
         'zfs',
     ],
@@ -173,19 +172,6 @@
             'threads': 32,
             'ram':  49152,
         },
-        'wireguard': {
-            'my_ip': '172.30.0.2/32',
-            's2s': {
-                'htz.mails': {
-                    'allowed_ips': [
-                        '10.0.10.0/24',
-                        '10.0.10.0/24',
-                        '192.168.179.0/24',
-                        '10.0.227.0/24', # mseibert.freescout
-                    ],
-                },
-            },
-        },
         'zfs': {
             'zfs_arc_max_percent': 80,
             'storage_classes': {
diff --git a/nodes/htz.mails.py b/nodes/htz.mails.py
index 418fdc9..287feac 100644
--- a/nodes/htz.mails.py
+++ b/nodes/htz.mails.py
@@ -22,15 +22,6 @@
         'zfs',
     ],
     'metadata': {
-
-
-        'users': {
-            'root': {
-                #'password': 'November99!!..',
-            },
-        },
-
-
         'id': 'ea29bdf0-0b47-4bf4-8346-67d60c9dc4ae',
         'network': {
             'internal': {
@@ -210,7 +201,7 @@
         'wireguard': {
             'my_ip': '172.30.0.1/24',
             's2s': {
-                'home.server': {
+                'home.router': {
                     'allowed_ips': [
                         '10.0.0.0/24',
                         '10.0.2.0/24',