diff --git a/apps/dokploy/templates/immich/docker-compose.yml b/apps/dokploy/templates/immich/docker-compose.yml
index 0c03e96f0..2a9fb00be 100644
--- a/apps/dokploy/templates/immich/docker-compose.yml
+++ b/apps/dokploy/templates/immich/docker-compose.yml
@@ -15,16 +15,20 @@ services:
         condition: service_healthy
     environment:
       PORT: 2283
-      DB_HOSTNAME: immich-database
-      DB_PORT: 5432
-      DB_USERNAME: ${POSTGRES_USER}
-      DB_PASSWORD: ${POSTGRES_PASSWORD}
-      DB_DATABASE_NAME: immich
-      REDIS_HOSTNAME: immich-redis
-      REDIS_PORT: 6379
-      REDIS_DBINDEX: 0
-      SERVER_URL: https://${IMMICH_HOST}
-      FRONT_BASE_URL: https://${IMMICH_HOST}
+      SERVER_URL: ${SERVER_URL}
+      FRONT_BASE_URL: ${FRONT_BASE_URL}
+      # Database Configuration
+      DB_HOSTNAME: ${DB_HOSTNAME}
+      DB_PORT: ${DB_PORT}
+      DB_USERNAME: ${DB_USERNAME}
+      DB_PASSWORD: ${DB_PASSWORD}
+      DB_DATABASE_NAME: ${DB_DATABASE_NAME}
+      # Redis Configuration
+      REDIS_HOSTNAME: ${REDIS_HOSTNAME}
+      REDIS_PORT: ${REDIS_PORT}
+      REDIS_DBINDEX: ${REDIS_DBINDEX}
+      # Server Configuration
+      TZ: ${TZ}
     restart: always
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:2283/server-info/ping"]
@@ -39,9 +43,9 @@ services:
     volumes:
       - immich-model-cache:/cache
     environment:
-      REDIS_HOSTNAME: immich-redis
-      REDIS_PORT: 6379
-      REDIS_DBINDEX: 0
+      REDIS_HOSTNAME: ${REDIS_HOSTNAME}
+      REDIS_PORT: ${REDIS_PORT}
+      REDIS_DBINDEX: ${REDIS_DBINDEX}
     restart: always
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:3003/ping"]
@@ -69,12 +73,12 @@ services:
     volumes:
       - immich-postgres:/var/lib/postgresql/data
     environment:
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
-      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${DB_PASSWORD}
+      POSTGRES_USER: ${DB_USERNAME}
       POSTGRES_DB: immich
       POSTGRES_INITDB_ARGS: '--data-checksums'
     healthcheck:
-      test: pg_isready -U ${POSTGRES_USER} -d immich || exit 1
+      test: pg_isready -U ${DB_USERNAME} -d immich || exit 1
       interval: 10s
       timeout: 5s
       retries: 5