diff --git a/swarm/monitoring.yaml b/swarm/monitoring.yaml
index 6c8c8aa..152b56a 100644
--- a/swarm/monitoring.yaml
+++ b/swarm/monitoring.yaml
@@ -37,7 +37,7 @@ services:
         caddy: prometheus.netgrimoire.com
         caddy.reverse_proxy: prometheus:9090
         caddy.import: crowdsec
-     #   caddy.import_1: authentik
+        caddy.import_1: authentik
 
         # --- Uptime Kuma ---
         kuma.prometheus.http.name: Prometheus
@@ -89,7 +89,7 @@ services:
         caddy: grafana.netgrimoire.com
         caddy.reverse_proxy: grafana:3000
         caddy.import: crowdsec
-      #  caddy.import_1: authentik
+        caddy.import_1: authentik
 
         # --- Uptime Kuma ---
         kuma.grafana.http.name: Grafana
@@ -142,7 +142,7 @@ services:
         caddy: alertmanager.netgrimoire.com
         caddy.reverse_proxy: alertmanager:9093
         caddy.import: crowdsec
-     #   caddy.import_1: authentik
+        caddy.import_1: authentik
 
         # --- Uptime Kuma ---
         kuma.alertmanager.http.name: Alertmanager
@@ -159,7 +159,8 @@ services:
         diun.enable: "true"
 
   # ============================================================
-  # CADVISOR — Container metrics (all nodes)
+  # CADVISOR — Container metrics (all nodes including Pi)
+  # Multi-arch image — runs on aarch64 and x86_64
   # ============================================================
   cadvisor:
     image: gcr.io/cadvisor/cadvisor:latest
@@ -183,26 +184,21 @@ services:
         delay: 5s
         max_attempts: 3
         window: 120s
-      placement:
-        constraints:
-          - node.platform.arch != aarch64
-          - node.platform.arch != arm
       labels:
         # --- DIUN ---
         diun.enable: "true"
 
   # ============================================================
-  # NODE EXPORTER — Host metrics (all nodes)
+  # NODE EXPORTER — Host metrics (all nodes including Pi)
+  # Multi-arch image — runs on aarch64 and x86_64
   # ============================================================
   node-exporter:
     image: prom/node-exporter:latest
-    hostname: "{{.Node.Hostname}}"
     environment:
       TZ: America/Chicago
     command:
       - --path.rootfs=/host
       - --collector.filesystem.mount-points-exclude=^/(sys|proc|dev|host|etc)($$|/)
-      - --collector.textfile.directory=/host/etc/node-exporter
     volumes:
       - /:/host:ro,rslave
     networks:
@@ -214,10 +210,6 @@ services:
         delay: 5s
         max_attempts: 3
         window: 120s
-      placement:
-        constraints:
-          - node.platform.arch != aarch64
-          - node.platform.arch != arm
       labels:
         # --- DIUN ---
         diun.enable: "true"