diff --git a/hosts/monitoring/blackbox.yml b/hosts/monitoring/blackbox.yml
index 2c38e5f..a1049a6 100644
--- a/hosts/monitoring/blackbox.yml
+++ b/hosts/monitoring/blackbox.yml
@@ -1,3 +1,11 @@
 modules:
-  icmp:
+  icmp6:
     prober: icmp
+    icmp:
+      preferred_ip_protocol: ip6
+      ip_protocol_fallback: false
+  icmp4:
+    prober: icmp
+    icmp:
+      preferred_ip_protocol: ip4
+      ip_protocol_fallback: false
diff --git a/hosts/monitoring/configuration.nix b/hosts/monitoring/configuration.nix
index 5b20a30..6763e7b 100644
--- a/hosts/monitoring/configuration.nix
+++ b/hosts/monitoring/configuration.nix
@@ -72,11 +72,75 @@ with lib;
         ];
       }
       {
-        job_name = "blackbox";
+        job_name = "blackbox_icmp6";
         scrape_interval = "20s";
         metrics_path = "/probe";
         params = {
-          module = [ "icmp" ];
+          module = [ "icmp6" ];
+        };
+        static_configs = [
+          {
+            targets = [
+              # Internet Probes
+              "clerie.de"
+              "vcp.de"
+
+              # Vlan Probes
+              "gw.services.net.bula22.de"
+              "gw.management.net.bula22.de"
+              "gw.technik-iot.net.bula22.de"
+              "gw.technik.net.bula22.de"
+              "gw.hospital.net.bula22.de"
+              "gw.zoll.net.bula22.de"
+              "gw.leitstelle.net.bula22.de"
+              "gw.verwaltung.net.bula22.de"
+              "gw.yolo.net.bula22.de"
+              "gw.infojurte.net.bula22.de"
+              "gw.international.net.bula22.de"
+              "gw.programmtresen.net.bula22.de"
+              "gw.open-office.net.bula22.de"
+
+              # Service Probes
+              "router.bula22.de"
+              "radius.bula22.de"
+              "yate.bula22.de"
+              "monitoring.bula22.de"
+              "dns.bula22.de"
+              "yate-dialup.bula22.de"
+              "nerd.bula22.de"
+              "pre-router.bula22.de"
+              "nixdeploy.bula22.de"
+
+              # External Service Probes
+              "vcp-bula-mon.bula22.de"
+              "vcp-bula-telko.bula22.de"
+            ];
+            labels = {
+              "module" = "icmp6";
+            };
+          }
+        ];
+        relabel_configs = [
+          {
+            source_labels = [ "__address__" ];
+            target_label = "__param_target";
+          }
+          {
+            source_labels = [ "__param_target" ];
+            target_label = "instance";
+          }
+          {
+            target_label = "__address__";
+            replacement = "[::1]:9115";
+          }
+        ];
+      }
+      {
+        job_name = "blackbox_icmp4";
+        scrape_interval = "20s";
+        metrics_path = "/probe";
+        params = {
+          module = [ "icmp4" ];
         };
         static_configs = [
           {
@@ -130,11 +194,10 @@ with lib;
               "nerd.bula22.de"
               "pre-router.bula22.de"
               "nixdeploy.bula22.de"
-
-              # External Service Probes
-              "vcp-bula-mon.bula22.de"
-              "vcp-bula-telko.bula22.de"
             ];
+            labels = {
+              "module" = "icmp4";
+            };
           }
         ];
         relabel_configs = [