diff --git a/tmm.yaml b/tmm.yaml
index 812408e..a42ba3c 100755
--- a/tmm.yaml
+++ b/tmm.yaml
@@ -1,40 +1,58 @@
 services:
   tinymediamanager_service:
     image: tinymediamanager/tinymediamanager:latest
-    container_name: tinymediamanager
     networks:
       - netgrimoire
-    ports:
-      #- 5909:5900 # VNC port
-      - 4000:4000 # Webinterface
+
     environment:
-      - USER_ID=1001
-      - GROUP_ID=998
-      - TZ=America/Chicago
-      - PASSWORD=F@lcon12
-      - ALLOW_DIRECT_VNC=true
-      - LC_ALL=en_US.UTF-8 # force UTF8
-      - LANG=en_US.UTF-8   # force UTF8
+      TZ: America/Chicago
+      PUID: "1001"
+      PGID: "998"
+      USER_ID: "1001"
+      GROUP_ID: "998"
+      PASSWORD: "F@lcon12"
+      ALLOW_DIRECT_VNC: "true"
+      LC_ALL: "en_US.UTF-8" # force UTF8
+      LANG: "en_US.UTF-8"   # force UTF8
+
+    # Match your standard UID:GID execution model
+    #user: "1001:998"
+
+    ports:
+      # - target: 5900
+      #   published: 5909
+      #   protocol: tcp
+      #   mode: ingress   # VNC port (optional)
+      - target: 4000
+        published: 4000
+        protocol: tcp
+        mode: ingress   # Webinterface
+
     volumes:
-      - "/data/nfs/Baxter/Docker/tinymediamanager:/config:rw"
-      - "/data/nfs/Baxter:/media:rw"  
+      - /data/nfs/Baxter/Docker/tinymediamanager:/config:rw
+      - /data/nfs/Baxter:/media:rw
+
     deploy:
       labels:
-        - homepage.group=Application
-        - homepage.name=Tiney Media Manager
-        - homepage.icon=troddit.png
-        - homepage.href=http://tmm.netgrimoire.com
-        - homepage.description=Media Manager
-        - kuma.app.http.name="Tiny Media Manager"
-        - kuma.wapp.http.url=http://tinymediamanager:4000
-        - caddy=tmm.netgrimoire.com
-        - caddy.import=authentik
-        - caddy.reverse_proxy="{{upstreams 4000}}"
+        # Homepage
+        homepage.group: "Media Management"
+        homepage.name: "Tiny Media Manager"
+        homepage.icon: "troddit.png"
+        homepage.href: "https://tmm.netgrimoire.com"
+        homepage.description: "Media Manager"
+
+        # Kuma
+        kuma.app.http.name: "Tiny Media Manager"
+        kuma.app.http.url: "http://tinymediamanager_service:4000"
+
+        # Caddy
+        caddy: "tmm.netgrimoire.com"
+        caddy.import: "authentik"
+        caddy.reverse_proxy: "{{upstreams 4000}}"
+
+        # Diun (image update monitoring)
+        diun.enable: "true"
+
 networks:
   netgrimoire:
-    external: true   
-
-
-
-
- 
\ No newline at end of file
+    external: true