diff --git a/Calibre-web.yaml b/Calibre-web.yaml
index 7f64807..9b9271b 100644
--- a/Calibre-web.yaml
+++ b/Calibre-web.yaml
@@ -1,52 +1,60 @@
 services:
   calibre-web-automated:
     image: crocodilestick/calibre-web-automated:latest
-    container_name: calibre-web-automated
-    environment:
-      # Only change these if you know what you're doing
-      - PUID=1001
-      - PGID=998
-      # Edit to match your current timezone https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
-      - TZ=America/Chicago
-    volumes:
-
-     # - /data/nfs/Baxter/Data/media:/data:shared
-      # CW users migrating should stop their existing CW instance, make a copy of the config folder, and bind that here to carry over all of their user settings ect.
-      - /DockerVol/Calibre-web/Config:/config 
-      # This is an ingest dir, NOT a library one. Anything added here will be automatically added to your library according to the settings you have configured in CWA Settings page. All files placed here are REMOVED AFTER PROCESSING
-      #- /path/to/the/folder/you/want/to/use/for/book/ingest:/cwa-book-ingest
-      # If you don't have an existing library, CWA will automatically create one at the bind provided here
-      #- /path/to/your/calibre/library:/calibre-library 
-      # - /data/nfs/Baxter/Data/media:/data:shared
-      - /data/nfs/Baxter/Data/media/books/library/Netgrimoire:/calibre-library:shared
     networks:
       - netgrimoire
+
+    environment:
+      # Only change these if you know what you're doing
+      PUID: "1001"
+      PGID: "998"
+      # Edit to match your current timezone https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+      TZ: America/Chicago
+
+    # Match your standard UID:GID execution model
+    user: "1001:998"
+
+    volumes:
+      # - /data/nfs/Baxter/Data/media:/data:shared
+      # CW users migrating should stop their existing CW instance, make a copy of the config folder, and bind that here to carry over all of their user settings ect.
+      - /DockerVol/Calibre-web/Config:/config
+      # This is an ingest dir, NOT a library one. Anything added here will be automatically added to your library according to the settings you have configured in CWA Settings page. All files placed here are REMOVED AFTER PROCESSING
+      # - /path/to/the/folder/you/want/to/use/for/book/ingest:/cwa-book-ingest
+      # If you don't have an existing library, CWA will automatically create one at the bind provided here
+      # - /path/to/your/calibre/library:/calibre-library
+      # - /data/nfs/Baxter/Data/media:/data:shared
+      - /data/nfs/Baxter/Data/media/books/library/Netgrimoire:/calibre-library:shared
+
     ports:
       # Change the first number to change the port you want to access the Web UI, not the second
-      - 8079:8083 
-    restart: unless-stopped
-    logging:
-      driver: "gelf"
-      options:
-        gelf-address: "udp://192.168.5.17:12201"
-        tag: "calibre-web-automatic"
+      - target: 8083
+        published: 8079
+        protocol: tcp
+        mode: ingress
+
+
     deploy:
-      labels:
-        homepage.group: "Application"
-        homepage.name: "Calibre-Web Automated"
-        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"
-        caddy: "books.netgrimoire.com , books.pncharris.com"
-        #caddy.import: "authentik"
-        caddy.reverse_proxy: "{{upstreams 8083}}"
       placement:
         constraints:
           - node.hostname == nas
 
+      labels:
+        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"
+
+        caddy: "books.netgrimoire.com , books.pncharris.com"
+        # caddy.import: "authentik"
+        caddy.reverse_proxy: "{{upstreams 8083}}"
+
+        # Diun (image update monitoring)
+        diun.enable: "true"
 
 networks:
   netgrimoire:
-    external: true
\ No newline at end of file
+    external: true