diff --git a/linkding.yaml b/linkding.yaml
index 7a12d64..6fbc02b 100644
--- a/linkding.yaml
+++ b/linkding.yaml
@@ -1,34 +1,49 @@
 services:
   linkding:
     image: sissbruecker/linkding:1.13.0
-    container_name: linkding
-    hostname: linkding
     networks:
       - netgrimoire
+
+    environment:
+      TZ: America/Chicago
+      PUID: "1001"
+      PGID: "998"
+
+    user: "1001:998"
+
     ports:
-      - 9090:9090
+      - target: 9090
+        published: 9090
+        protocol: tcp
+        mode: ingress
+
     volumes:
       - /data/nfs/Baxter/Docker/linkding/data:/etc/linkding/data:rw
-    environment:
-      - TZ=America/Chicago
-    user: "1001:998"
-    restart: unless-stopped
+
     deploy:
       labels:
-        - homepage.group=Applications
-        - homepage.name=Linkding
-        - homepage.icon=linkding.png
-        - homepage.href=https://link.netgrimoire.com
-        - homepage.description=Self-hosted bookmark manager
-        - kuma.linkding.http.name="Linkding"
-        - kuma.linkding.http.url=http://linkding:9090
-        - caddy=link.netgrimoire.com
-        #- caddy.import=authentik
-        - caddy.reverse_proxy="{{upstreams 9090}}"
-        - diun.enable=true
-      #placement:
-      #  constraints:
-      #    - node.labels.general == true
+        # Homepage
+        homepage.group: "PNCHarris Apps"
+        homepage.name: "Linkding"
+        homepage.icon: "linkding.png"
+        homepage.href: "https://link.netgrimoire.com"
+        homepage.description: "Self-hosted bookmark manager"
+
+        # Kuma
+        kuma.linkding.http.name: "Linkding"
+        kuma.linkding.http.url: "http://linkding:9090"
+
+        # Caddy
+        caddy: "link.netgrimoire.com"
+        # caddy.import: "authentik"
+        caddy.reverse_proxy: "{{upstreams 9090}}"
+
+        # Diun (image update monitoring)
+        diun.enable: "true"
+
+      # placement:
+      #   constraints:
+      #     - node.labels.general == true
 
 networks:
   netgrimoire: