diff --git a/time-tracking/docker-compose.yml b/time-tracking/docker-compose.yml
index da2c2f2..47ac1ad 100644
--- a/time-tracking/docker-compose.yml
+++ b/time-tracking/docker-compose.yml
@@ -21,13 +21,14 @@ services:
       folder.view2: "Databases"
 
   kimai:
-    image: kimai/kimai2:apache
+    image: kimai/kimai2:stable
     container_name: kimai
     volumes:
       - /mnt/user/appdata/kimai/data:/opt/kimai/var/data
       - /mnt/user/appdata/kimai/plugins:/opt/kimai/var/plugins
-    ports:
-      - 7183:8001
+    networks:
+      - default
+      - pangolin
     environment:
       - ADMINMAIL=${ADMIN_EMAIL}
       - ADMINPASS=${ADMIN_PASSWORD}
@@ -36,13 +37,37 @@ services:
       - MAILER_FROM=${MAILER_FROM}
     labels:
       net.unraid.docker.icon: "https://raw.githubusercontent.com/linuxserver/docker-templates/refs/heads/master/linuxserver.io/img/kimai-logo.png"
-      net.unraid.docker.webui: https://kimai.homecube.org
+      net.unraid.docker.webui: https://${DOMAIN}
       net.unraid.docker.shell: bash
       folder.view2: "Services"
 
+      pangolin.public-resources.kimai-time-tracking.name: "${RESOURCE_NAME}"
+      pangolin.public-resources.kimai-time-tracking.full-domain: "${DOMAIN}"
+      pangolin.public-resources.kimai-time-tracking.protocol: "http"
+
+      pangolin.public-resources.kimai-time-tracking.auth.sso-enabled: true
+      pangolin.public-resources.kimai-time-tracking.auth.sso-roles[0]: "Member"
+
+      pangolin.public-resources.kimai-time-tracking.targets[0].method: "http"
+      pangolin.public-resources.kimai-time-tracking.targets[0].port: 8001
+
+      pangolin.public-resources.kimai-time-tracking.targets[0].healthcheck.enabled: true
+      pangolin.public-resources.kimai-time-tracking.targets[0].healthcheck.hostname: "kimai"
+      pangolin.public-resources.kimai-time-tracking.targets[0].healthcheck.port: 8001
+      pangolin.public-resources.kimai-time-tracking.targets[0].healthcheck.path: "/"
+      pangolin.public-resources.kimai-time-tracking.targets[0].healthcheck.method: "GET"
+      pangolin.public-resources.kimai-time-tracking.targets[0].healthcheck.status: 200
+      pangolin.public-resources.kimai-time-tracking.targets[0].healthcheck.interval: 30
+      pangolin.public-resources.kimai-time-tracking.targets[0].healthcheck.timeout: 5
+
       # HOMEPAGE
       homepage.group: Productivity
       homepage.name: Kimai
       homepage.icon: kimai.png
-      homepage.href: https://kimai.homecube.org
+      homepage.href: https://${DOMAIN}
       homepage.description: Time Tracking
+
+networks:
+  pangolin:
+    name: pangolin_net
+    external: true