diff --git a/swarm/beszel.yaml b/swarm/beszel.yaml
index e303bd2..6c31a76 100644
--- a/swarm/beszel.yaml
+++ b/swarm/beszel.yaml
@@ -2,14 +2,12 @@
 services:
   beszel:
     image: henrygd/beszel
-    container_name: beszel
-    hostname: beszel
     networks:
       - netgrimoire
     volumes:
       - /data/nfs/znas/Docker/beszel:/beszel_data
     environment:
-      - TZ=America/Chicago
+      TZ: America/Chicago
     user: "1964:1964"
     ports:
       - 8098:8090
@@ -20,18 +18,23 @@ services:
         max_attempts: 5
         window: 60s
       labels:
-        - homepage.group=Monitoring
-        - homepage.name=Beszel
-        - homepage.icon=beszel.png
-        - homepage.href=https://beszel.netgrimoire.com
-        - homepage.description=Beszel Service
-        - kuma.beszel.http.name="Beszel"
-        - kuma.beszel.http.url=http://beszel:8090
-        - caddy=beszel.netgrimoire.com
-        - caddy.import=authentik
-        - caddy.reverse_proxy="{{upstreams 8090}}"
+        homepage.group: Monitoring
+        homepage.name: Beszel
+        homepage.icon: beszel.png
+        homepage.href: https://beszel.netgrimoire.com
+        homepage.description: Beszel Service
+        diun.enable: "true"
+        monitor.name: Beszel
+        monitor.url: https://beszel.netgrimoire.com
+        caddy: beszel.netgrimoire.com
+        caddy.import: authentik
+        caddy.reverse_proxy: beszel:8090
+        caddy.import_1: crowdsec
+        caddy.import_2: authentik
       placement:
         constraints:
+          - node.platform.arch != arm
+          - node.platform.arch != aarch64
           - node.labels.general == true
 
 ##