diff --git a/docker-compose.yml b/docker-compose.yml
index 4ef64bc..51ef426 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -214,16 +214,16 @@ services:
   umami-db:
     image: postgres:15-alpine
     environment:
-      POSTGRES_DB: umamidb
-      POSTGRES_USER: umami_user
-      POSTGRES_PASSWORD: umami_pw
+      POSTGRES_DB: ${UMAMI_DB_NAME:-umamidb}
+      POSTGRES_USER: ${UMAMI_DB_USER:-umami_user}
+      POSTGRES_PASSWORD: ${UMAMI_DB_PASSWORD}
     volumes:
       - umami-db-data:/var/lib/postgresql/data
     restart: always
     networks:
       - dokploy-network
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U umami_user -d umamidb"]
+      test: ["CMD-SHELL", "pg_isready -U $${UMAMI_DB_USER:-umami_user} -d $${UMAMI_DB_NAME:-umamidb}"]
       interval: 5s
       timeout: 5s
       retries: 5
@@ -233,7 +233,7 @@ services:
     expose:
       - 3000
     environment:
-      DATABASE_URL: postgresql://umami_user:umami_pw@umami-db:5432/umamidb
+      DATABASE_URL: postgresql://${UMAMI_DB_USER:-umami_user}:${UMAMI_DB_PASSWORD}@umami-db:5432/${UMAMI_DB_NAME:-umamidb}
       APP_SECRET: ${UMAMI_APP_SECRET}
     depends_on:
       umami-db: