diff --git a/swarm/beszel_agents.yaml b/swarm/beszel_agents.yaml
index 167180e..92627b7 100755
--- a/swarm/beszel_agents.yaml
+++ b/swarm/beszel_agents.yaml
@@ -1,30 +1,10 @@
-#version: "3.8"
+networks:
+  netgrimoire:
+    external: true
 
 services:
-
-
-  beszel-agent-docker2:
-    image: henrygd/beszel-agent:latest
-    restart: unless-stopped
-    ports:
-      - 45877:45877
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-    networks:
-      - netgrimoire
-    environment:
-      KEY: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGNx6yKSqJHUiSKTM44/A1luwBije9HkHwnOxwXYx8q4"
-      LISTEN: "45877"
-    deploy:
-      mode: replicated
-      replicas: 1
-      placement:
-        constraints:
-          - node.hostname == docker2
-
   beszel-agent-docker3:
     image: henrygd/beszel-agent:latest
-    restart: unless-stopped
     ports:
       - 45878:45878
     volumes:
@@ -34,16 +14,30 @@ services:
     environment:
       KEY: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGNx6yKSqJHUiSKTM44/A1luwBije9HkHwnOxwXYx8q4"
       LISTEN: "45878"
+      PUID: "1964"
+      PGID: "1964"
     deploy:
       mode: replicated
       replicas: 1
+      restart_policy:
+        condition: any
+        delay: 5s
+        max_attempts: 3
+        window: 120s
       placement:
         constraints:
+          - node.platform.arch != aarch64
+          - node.platform.arch != arm
           - node.hostname == docker3
+      labels:
+        gremlin.version: "2026-04-1"
+        gremlin.caddy.skip: "true"
+        gremlin.homepage.skip: "true"
+        gremlin.monitor.skip: "true"
+        diun.enable: "true"
 
   beszel-agent-docker4:
     image: henrygd/beszel-agent:latest
-    restart: unless-stopped
     ports:
       - 45879:45879
     volumes:
@@ -53,16 +47,30 @@ services:
     environment:
       KEY: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGNx6yKSqJHUiSKTM44/A1luwBije9HkHwnOxwXYx8q4"
       LISTEN: "45879"
+      PUID: "1964"
+      PGID: "1964"
     deploy:
       mode: replicated
       replicas: 1
+      restart_policy:
+        condition: any
+        delay: 5s
+        max_attempts: 3
+        window: 120s
       placement:
         constraints:
+          - node.platform.arch != aarch64
+          - node.platform.arch != arm
           - node.hostname == docker4
+      labels:
+        gremlin.version: "2026-04-1"
+        gremlin.caddy.skip: "true"
+        gremlin.homepage.skip: "true"
+        gremlin.monitor.skip: "true"
+        diun.enable: "true"
 
   beszel-agent-docker5:
     image: henrygd/beszel-agent:latest
-    restart: unless-stopped
     ports:
       - 45883:45883
     volumes:
@@ -72,16 +80,30 @@ services:
     environment:
       KEY: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGNx6yKSqJHUiSKTM44/A1luwBije9HkHwnOxwXYx8q4"
       LISTEN: "45883"
+      PUID: "1964"
+      PGID: "1964"
     deploy:
       mode: replicated
       replicas: 1
+      restart_policy:
+        condition: any
+        delay: 5s
+        max_attempts: 3
+        window: 120s
       placement:
         constraints:
+          - node.platform.arch != aarch64
+          - node.platform.arch != arm
           - node.hostname == docker5
+      labels:
+        gremlin.version: "2026-04-1"
+        gremlin.caddy.skip: "true"
+        gremlin.homepage.skip: "true"
+        gremlin.monitor.skip: "true"
+        diun.enable: "true"
 
   beszel-agent-znas:
     image: henrygd/beszel-agent:latest
-    restart: unless-stopped
     ports:
       - 45880:45880
     volumes:
@@ -91,16 +113,30 @@ services:
     environment:
       KEY: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGNx6yKSqJHUiSKTM44/A1luwBije9HkHwnOxwXYx8q4"
       LISTEN: "45880"
+      PUID: "1964"
+      PGID: "1964"
     deploy:
       mode: replicated
       replicas: 1
+      restart_policy:
+        condition: any
+        delay: 5s
+        max_attempts: 3
+        window: 120s
       placement:
         constraints:
+          - node.platform.arch != aarch64
+          - node.platform.arch != arm
           - node.hostname == znas
+      labels:
+        gremlin.version: "2026-04-1"
+        gremlin.caddy.skip: "true"
+        gremlin.homepage.skip: "true"
+        gremlin.monitor.skip: "true"
+        diun.enable: "true"
 
   beszel-agent-dockerpi1:
     image: henrygd/beszel-agent:latest
-    restart: unless-stopped
     ports:
       - 45884:45884
     volumes:
@@ -110,15 +146,23 @@ services:
     environment:
       KEY: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGNx6yKSqJHUiSKTM44/A1luwBije9HkHwnOxwXYx8q4"
       LISTEN: "45884"
+      PUID: "1964"
+      PGID: "1964"
     deploy:
       mode: replicated
       replicas: 1
+      restart_policy:
+        condition: any
+        delay: 5s
+        max_attempts: 3
+        window: 120s
       placement:
         constraints:
-          - node.hostname == DockerPi1
-
-
-
-networks:
-  netgrimoire:
-    external: true
+          - node.hostname == dockerpi1
+      labels:
+        gremlin.version: "2026-04-1"
+        gremlin.arm.allow: "true"
+        gremlin.caddy.skip: "true"
+        gremlin.homepage.skip: "true"
+        gremlin.monitor.skip: "true"
+        diun.enable: "true"
\ No newline at end of file