diff --git a/argocd/manifests/grafana-config/dashboards/configmap-devpi.yaml b/argocd/manifests/grafana-config/dashboards/configmap-devpi.yaml
index ebe0a3a..acb062a 100644
--- a/argocd/manifests/grafana-config/dashboards/configmap-devpi.yaml
+++ b/argocd/manifests/grafana-config/dashboards/configmap-devpi.yaml
@@ -40,7 +40,7 @@ data:
           },
           "pluginVersion": "11.0.0",
           "targets": [
-            { "datasource": { "type": "prometheus", "uid": "prometheus" }, "expr": "probe_success{target=\"devpi\"}", "refId": "A" }
+            { "datasource": { "type": "prometheus", "uid": "prometheus" }, "expr": "probe_success{job=\\"integrations/blackbox/devpi\\"}", "refId": "A" }
           ],
           "title": "Devpi Status",
           "type": "stat"
@@ -67,7 +67,7 @@ data:
           },
           "pluginVersion": "11.0.0",
           "targets": [
-            { "datasource": { "type": "prometheus", "uid": "prometheus" }, "expr": "probe_duration_seconds{target=\"devpi\"}", "refId": "A" }
+            { "datasource": { "type": "prometheus", "uid": "prometheus" }, "expr": "probe_duration_seconds{job=\\"integrations/blackbox/devpi\\"}", "refId": "A" }
           ],
           "title": "Response Time",
           "type": "stat"
@@ -94,7 +94,7 @@ data:
           },
           "pluginVersion": "11.0.0",
           "targets": [
-            { "datasource": { "type": "prometheus", "uid": "prometheus" }, "expr": "avg_over_time(probe_success{target=\"devpi\"}[$__range])", "refId": "A" }
+            { "datasource": { "type": "prometheus", "uid": "prometheus" }, "expr": "avg_over_time(probe_success{job=\\"integrations/blackbox/devpi\\"}[$__range])", "refId": "A" }
           ],
           "title": "Uptime (selected period)",
           "type": "stat"
@@ -139,7 +139,7 @@ data:
           },
           "pluginVersion": "11.0.0",
           "targets": [
-            { "datasource": { "type": "prometheus", "uid": "prometheus" }, "expr": "probe_duration_seconds{target=\"devpi\"}", "legendFormat": "Response Time", "refId": "A" }
+            { "datasource": { "type": "prometheus", "uid": "prometheus" }, "expr": "probe_duration_seconds{job=\\"integrations/blackbox/devpi\\"}", "legendFormat": "Response Time", "refId": "A" }
           ],
           "title": "Response Time Over Time",
           "type": "timeseries"
diff --git a/argocd/manifests/grafana-config/dashboards/configmap-services.yaml b/argocd/manifests/grafana-config/dashboards/configmap-services.yaml
index 0b07133..241212a 100644
--- a/argocd/manifests/grafana-config/dashboards/configmap-services.yaml
+++ b/argocd/manifests/grafana-config/dashboards/configmap-services.yaml
@@ -40,11 +40,11 @@ data:
           },
           "pluginVersion": "11.0.0",
           "targets": [
-            { "datasource": { "type": "prometheus", "uid": "prometheus" }, "expr": "probe_success{target=\"miniflux\"}", "legendFormat": "Miniflux", "refId": "A" },
-            { "datasource": { "type": "prometheus", "uid": "prometheus" }, "expr": "probe_success{target=\"kiwix\"}", "legendFormat": "Kiwix", "refId": "B" },
-            { "datasource": { "type": "prometheus", "uid": "prometheus" }, "expr": "probe_success{target=\"transmission\"}", "legendFormat": "Transmission", "refId": "C" },
-            { "datasource": { "type": "prometheus", "uid": "prometheus" }, "expr": "probe_success{target=\"devpi\"}", "legendFormat": "Devpi", "refId": "D" },
-            { "datasource": { "type": "prometheus", "uid": "prometheus" }, "expr": "probe_success{target=\"argocd\"}", "legendFormat": "ArgoCD", "refId": "E" }
+            { "datasource": { "type": "prometheus", "uid": "prometheus" }, "expr": "probe_success{job=\"integrations/blackbox/miniflux\"}", "legendFormat": "Miniflux", "refId": "A" },
+            { "datasource": { "type": "prometheus", "uid": "prometheus" }, "expr": "probe_success{job=\"integrations/blackbox/kiwix\"}", "legendFormat": "Kiwix", "refId": "B" },
+            { "datasource": { "type": "prometheus", "uid": "prometheus" }, "expr": "probe_success{job=\"integrations/blackbox/transmission\"}", "legendFormat": "Transmission", "refId": "C" },
+            { "datasource": { "type": "prometheus", "uid": "prometheus" }, "expr": "probe_success{job=\"integrations/blackbox/devpi\"}", "legendFormat": "Devpi", "refId": "D" },
+            { "datasource": { "type": "prometheus", "uid": "prometheus" }, "expr": "probe_success{job=\"integrations/blackbox/argocd\"}", "legendFormat": "ArgoCD", "refId": "E" }
           ],
           "title": "Service Status",
           "type": "stat"
@@ -89,11 +89,11 @@ data:
           },
           "pluginVersion": "11.0.0",
           "targets": [
-            { "datasource": { "type": "prometheus", "uid": "prometheus" }, "expr": "probe_duration_seconds{target=\"miniflux\"}", "legendFormat": "Miniflux", "refId": "A" },
-            { "datasource": { "type": "prometheus", "uid": "prometheus" }, "expr": "probe_duration_seconds{target=\"kiwix\"}", "legendFormat": "Kiwix", "refId": "B" },
-            { "datasource": { "type": "prometheus", "uid": "prometheus" }, "expr": "probe_duration_seconds{target=\"transmission\"}", "legendFormat": "Transmission", "refId": "C" },
-            { "datasource": { "type": "prometheus", "uid": "prometheus" }, "expr": "probe_duration_seconds{target=\"devpi\"}", "legendFormat": "Devpi", "refId": "D" },
-            { "datasource": { "type": "prometheus", "uid": "prometheus" }, "expr": "probe_duration_seconds{target=\"argocd\"}", "legendFormat": "ArgoCD", "refId": "E" }
+            { "datasource": { "type": "prometheus", "uid": "prometheus" }, "expr": "probe_duration_seconds{job=\"integrations/blackbox/miniflux\"}", "legendFormat": "Miniflux", "refId": "A" },
+            { "datasource": { "type": "prometheus", "uid": "prometheus" }, "expr": "probe_duration_seconds{job=\"integrations/blackbox/kiwix\"}", "legendFormat": "Kiwix", "refId": "B" },
+            { "datasource": { "type": "prometheus", "uid": "prometheus" }, "expr": "probe_duration_seconds{job=\"integrations/blackbox/transmission\"}", "legendFormat": "Transmission", "refId": "C" },
+            { "datasource": { "type": "prometheus", "uid": "prometheus" }, "expr": "probe_duration_seconds{job=\"integrations/blackbox/devpi\"}", "legendFormat": "Devpi", "refId": "D" },
+            { "datasource": { "type": "prometheus", "uid": "prometheus" }, "expr": "probe_duration_seconds{job=\"integrations/blackbox/argocd\"}", "legendFormat": "ArgoCD", "refId": "E" }
           ],
           "title": "Response Time",
           "type": "timeseries"
@@ -121,11 +121,11 @@ data:
           },
           "pluginVersion": "11.0.0",
           "targets": [
-            { "datasource": { "type": "prometheus", "uid": "prometheus" }, "expr": "avg_over_time(probe_success{target=\"miniflux\"}[$__range])", "legendFormat": "Miniflux", "refId": "A" },
-            { "datasource": { "type": "prometheus", "uid": "prometheus" }, "expr": "avg_over_time(probe_success{target=\"kiwix\"}[$__range])", "legendFormat": "Kiwix", "refId": "B" },
-            { "datasource": { "type": "prometheus", "uid": "prometheus" }, "expr": "avg_over_time(probe_success{target=\"transmission\"}[$__range])", "legendFormat": "Transmission", "refId": "C" },
-            { "datasource": { "type": "prometheus", "uid": "prometheus" }, "expr": "avg_over_time(probe_success{target=\"devpi\"}[$__range])", "legendFormat": "Devpi", "refId": "D" },
-            { "datasource": { "type": "prometheus", "uid": "prometheus" }, "expr": "avg_over_time(probe_success{target=\"argocd\"}[$__range])", "legendFormat": "ArgoCD", "refId": "E" }
+            { "datasource": { "type": "prometheus", "uid": "prometheus" }, "expr": "avg_over_time(probe_success{job=\"integrations/blackbox/miniflux\"}[$__range])", "legendFormat": "Miniflux", "refId": "A" },
+            { "datasource": { "type": "prometheus", "uid": "prometheus" }, "expr": "avg_over_time(probe_success{job=\"integrations/blackbox/kiwix\"}[$__range])", "legendFormat": "Kiwix", "refId": "B" },
+            { "datasource": { "type": "prometheus", "uid": "prometheus" }, "expr": "avg_over_time(probe_success{job=\"integrations/blackbox/transmission\"}[$__range])", "legendFormat": "Transmission", "refId": "C" },
+            { "datasource": { "type": "prometheus", "uid": "prometheus" }, "expr": "avg_over_time(probe_success{job=\"integrations/blackbox/devpi\"}[$__range])", "legendFormat": "Devpi", "refId": "D" },
+            { "datasource": { "type": "prometheus", "uid": "prometheus" }, "expr": "avg_over_time(probe_success{job=\"integrations/blackbox/argocd\"}[$__range])", "legendFormat": "ArgoCD", "refId": "E" }
           ],
           "title": "Uptime (selected period)",
           "type": "stat"