diff --git a/templates/compose/kimai.yaml b/templates/compose/kimai.yaml
index 26cd3da1c..ba73ba980 100644
--- a/templates/compose/kimai.yaml
+++ b/templates/compose/kimai.yaml
@@ -6,24 +6,20 @@
 
 services:
   mysql:
-    image: mysql:8.3
-    container_name: kimai_db
+    image: mysql:8
     volumes:
-      - mysql:/var/lib/mysql
+      - kimai-mysql-data:/var/lib/mysql
     environment:
       - MYSQL_DATABASE=${MYSQL_DATABASE:-kimai}
-      - MYSQL_USER=${MYSQL_USER:-kimaiuser}
+      - MYSQL_USER=${SERVICE_USER_MYSQL}
       - MYSQL_PASSWORD=${SERVICE_PASSWORD_MYSQL}
-      - MYSQL_ROOT_PASSWORD=${SERVICE_PASSWORD_MYSQL_ROOT}
+      - MYSQL_ROOT_PASSWORD=${SERVICE_PASSWORD_ROOT}
     command: --default-storage-engine innodb
-    restart: unless-stopped
     healthcheck:
-      test: mysqladmin -p$$MYSQL_ROOT_PASSWORD ping -h localhost
-      interval: 20s
-      start_period: 10s
-      timeout: 10s
-      retries: 3
-
+      test: ["CMD", "mysqladmin", "ping", "-h", "127.0.0.1"]
+      interval: 5s
+      timeout: 20s
+      retries: 10
   kimai:
     image: kimai/kimai2:apache-latest
     container_name: kimai
@@ -31,22 +27,18 @@ services:
       mysql:
         condition: service_healthy
     volumes:
-      - data:/opt/kimai/var/data
+      - kimai-data:/opt/kimai/var/data
     environment:
-      - SERVICE_FQDN_KIMAI
-      - APP_SECRET=${SERVICE_PASSWORD_APP_SECRET}
+      - SERVICE_FQDN_KIMAI_8001
+      - APP_SECRET=${SERVICE_PASSWORD_APPSECRET}
       - MAILER_FROM=${MAILER_FROM:-kimai@example.com}
       - MAILER_URL=${MAILER_URL:-null://null}
       - ADMINMAIL=${ADMINMAIL:-admin@kimai.local}
       - ADMINPASS=${SERVICE_PASSWORD_ADMINPASS}
-      - DATABASE_URL=mysql://${MYSQL_USER}:${SERVICE_PASSWORD_MYSQL}@mysql/${MYSQL_DATABASE}?charset=utf8mb4&serverVersion=8.3.0
+      - DATABASE_URL=mysql://${SERVICE_USER_MYSQL}:${SERVICE_PASSWORD_MYSQL}@mysql/${MYSQL_DATABASE}?charset=utf8mb4&serverVersion=8.3.0
       - TRUSTED_HOSTS=localhost
-    restart: unless-stopped
-    labels:
-      - traefik.enable=true
-      - traefik.http.routers.kimai.entryPoints=http
-      - traefik.http.services.kimai.loadbalancer.server.port=8001
-
-volumes:
-  data:
-  mysql:
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://127.0.0.1:8001"]
+      interval: 2s
+      timeout: 10s
+      retries: 15