diff --git a/vaultwarden.yaml b/vaultwarden.yaml
index 379bf58..ba168c3 100644
--- a/vaultwarden.yaml
+++ b/vaultwarden.yaml
@@ -1,36 +1,52 @@
-services:  
+services:
   bitwarden:
     image: vaultwarden/server:latest
-    container_name: vaultwarden
-    hostname: vaultwarden
     networks:
       - netgrimoire
+
+    environment:
+      TZ: America/Chicago
+      PUID: "1001"
+      PGID: "998"
+
+    # Match your standard UID:GID execution model
+    #user: "1001:998"
+
     ports:
-      - 8093:80
+      - target: 80
+        published: 8093
+        protocol: tcp
+        mode: ingress
+
     volumes:
       - /DockerVol/bitwarden:/data
-     # - /data/nfs/Baxter/Docker/vaultwarden:/data
-    environment:
-      - TZ=America/Chicago
-      - PGID=998
-      - PUID=1001
-    restart: unless-stopped
+      # - /data/nfs/Baxter/Docker/vaultwarden:/data
+
     deploy:
-      labels:
-        - homepage.group=Application
-        - homepage.name=Vaultwarden
-        - homepage.icon=vaultwarden.png
-        - homepage.href=http://pass.netgrimoire.com
-        - homepage.description=Password Manager
-        - kuma.pass.http.name="vaultwarden"
-        - kuma.pass.http.url=http://bitwarden:80
-        - caddy=pass.netgrimoire.com
-      #  - caddy.import=authentik
-        - caddy.reverse_proxy="{{upstreams 80}}"
       placement:
         constraints:
-           - node.hostname == docker3
+          - node.hostname == docker3
+
+      labels:
+        # Homepage
+        homepage.group: "Application"
+        homepage.name: "Vaultwarden"
+        homepage.icon: "vaultwarden.png"
+        homepage.href: "https://pass.netgrimoire.com"
+        homepage.description: "Password Manager"
+
+        # Kuma
+        kuma.pass.http.name: "Vaultwarden"
+        kuma.pass.http.url: "http://bitwarden:80"
+
+        # Caddy
+        caddy: "pass.netgrimoire.com"
+        # caddy.import: "authentik"
+        caddy.reverse_proxy: "bitwarden:80"
+
+        # Diun (image update monitoring)
+        diun.enable: "true"
 
 networks:
   netgrimoire:
-    external: true   
\ No newline at end of file
+    external: true