diff --git a/system/default.nix b/system/default.nix
index 0f7a6354..dce0d503 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -33,24 +33,6 @@ with mylib.networking; {
         "50-ether" = mkSystemdNetwork "enp*";
       };
 
-      wireguard-tunnels = {
-        wg0-de-115 = (
-          mkWireguardService
-          "wg0-de-115"
-          "proton-de-115.key"
-          "9+CorlxrTsQR7qjIOVKsEkk8Z7UUS5WT3R1ccF7a0ic="
-          "194.126.177.14"
-        );
-
-        wg0-lu-16 = (
-          mkWireguardService
-          "wg0-lu-16"
-          "proton-lu-16.key"
-          "asu9KtQoZ3iKwELsDTgjPEiFNcD1XtgGgy3O4CZFg2w="
-          "92.223.89.133"
-        );
-      };
-
       allowedTCPPorts = [
         22 # SSH
         80 # HTTP
diff --git a/system/nixinator/default.nix b/system/nixinator/default.nix
index 9f3ff41f..ae3f4eb3 100644
--- a/system/nixinator/default.nix
+++ b/system/nixinator/default.nix
@@ -27,6 +27,26 @@
       hydra.enable = true;
       sabnzbd.enable = true;
     };
+
+    systemd-networkd = {
+      wireguard-tunnels = {
+        wg0-de-115 = (
+          mylib.networking.mkWireguardService
+          "wg0-de-115"
+          "proton-de-115.key"
+          "9+CorlxrTsQR7qjIOVKsEkk8Z7UUS5WT3R1ccF7a0ic="
+          "194.126.177.14"
+        );
+
+        wg0-lu-16 = (
+          mylib.networking.mkWireguardService
+          "wg0-lu-16"
+          "proton-lu-16.key"
+          "asu9KtQoZ3iKwELsDTgjPEiFNcD1XtgGgy3O4CZFg2w="
+          "92.223.89.133"
+        );
+      };
+    };
   };
 
   # Low latency audio
diff --git a/system/nixtop/default.nix b/system/nixtop/default.nix
index a7c89e3d..c4c192e5 100644
--- a/system/nixtop/default.nix
+++ b/system/nixtop/default.nix
@@ -12,6 +12,30 @@
     ../modules
   ];
 
+  modules = {
+    systemd-networkd = {
+      wireguard-tunnels = {
+        wg0-de-74 = (
+          mylib.networking.mkWireguardService
+          "wg0-de-74"
+          "proton-de-74.key"
+          "fvHmPj3wAKolN80+/KJ3a/DFjMToCsr3iPGwX8+og1g="
+          "194.126.177.7"
+        );
+
+        wg0-lu-6 = (
+          mylib.networking.mkWireguardService
+          "wg0-lu-6"
+          "proton-lu-6.key"
+          "EAZS8FTE2sXm8NFD8ViqcO5PMzvnyIHD1ScxX8UxIzE="
+          "92.223.89.141"
+        );
+      };
+    };
+  };
+
+  programs.light.enable = true;
+
   services.xserver = {
     # Configure keymap in X11
     layout = "de";