diff --git a/swarm/Calibre-web.yaml b/swarm/Calibre-web.yaml
index 9267165..7ec1a84 100644
--- a/swarm/Calibre-web.yaml
+++ b/swarm/Calibre-web.yaml
@@ -32,7 +32,7 @@ services:
         
 
     healthcheck:
-      test: ["CMD-SHELL", "curl -f http://localhost:$${CWA_PORT_OVERRIDE:-8083}/ || curl -f -k https://localhost:$${CWA_PORT_OVERRIDE:-8083}/ || exit 1"]
+      test: ["CMD-SHELL", "curl -f http://localhost:${CWA_PORT_OVERRIDE:-8083}/ || curl -f -k https://localhost:${CWA_PORT_OVERRIDE:-8083}/ || exit 1"]
       interval: 30s
       timeout: 10s
       retries: 3
@@ -41,23 +41,32 @@ services:
 
 
     deploy:
+      restart_policy:
+        condition: any
+        delay: 5s
+        max_attempts: 3
+        window: 120s
       placement:
         constraints:
+          - node.platform.arch != arm
+          - node.platform.arch != aarch64
           - node.hostname == znas
 
       labels:
+        gremlin.version: "2026-04-1"
         homepage.group: "PNCHarris Apps"
         homepage.name: "Family Library"
         homepage.icon: "calibre-web.png"
         homepage.href: "https://books.netgrimoire.com"
         homepage.description: "Calibre-Web Automated"
-
-        kuma.cwa.http.name: "Calibre-Web Automated"
-        kuma.cwa.http.url: "http://calibre-web-automated:8083"
+        monitor.name: Calibre-web-automated
+        monitor.url: https://"books.netgrimoire.com , books.pncharris.com"
 
         caddy: "books.netgrimoire.com , books.pncharris.com"
         # caddy.import: "authentik"
         caddy.reverse_proxy: "calibre-web-automated:8083"
+        caddy.import_1: crowdsec
+        caddy.import_2: authentik
 
         # Diun (image update monitoring)
         diun.enable: "true"