diff --git a/modules/monitoring-client/default.nix b/modules/monitoring-client/default.nix
index 46b89576..7ca9a244 100644
--- a/modules/monitoring-client/default.nix
+++ b/modules/monitoring-client/default.nix
@@ -24,6 +24,11 @@ in {
         openFirewall = true;
         listenAddress = cfg.listenAddress;
       };
+      wireguard = {
+        enable = true;
+        openFirewall = true;
+        listenAddress = cfg.listenAddress;
+      };
     };
   };
 }
diff --git a/modules/monitoring-server/default.nix b/modules/monitoring-server/default.nix
index eb225181..beb348cb 100644
--- a/modules/monitoring-server/default.nix
+++ b/modules/monitoring-server/default.nix
@@ -68,16 +68,6 @@ in {
       listenAddress = cfg.listenAddress;
       port = 9001;
       scrapeConfigs = [
-        {
-          job_name = "node_exporters";
-          static_configs = [
-            {
-              targets =
-                ["${cfg.listenAddress}:9002"]
-                ++ cfg.node_exporter.hosts;
-            }
-          ];
-        }
         {
           job_name = "snmp_wohnung_aachen_mikrotik";
           scrape_interval = "15s";
@@ -106,6 +96,26 @@ in {
             }
           ];
         }
+        {
+          job_name = "node_exporters";
+          static_configs = [
+            {
+              targets =
+                ["${cfg.listenAddress}:9002"]
+                ++ cfg.node_exporter.hosts;
+            }
+          ];
+        }
+        {
+          job_name = "wireguard";
+          static_configs = [
+            {
+              targets =
+                ["${cfg.listenAddress}:9586"]
+                ++ cfg.node_exporter.hosts;
+            }
+          ];
+        }
         {
           job_name = "smokeping";
           scrape_interval = "15s";