diff --git a/docker-compose.yml b/docker-compose.yml
index 7ca6946..aa4b50a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,7 +25,7 @@ services:
     expose:
       - 5432
     environment:
-      POSTGRES_PASSWORD: changeme
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       POSTGRES_DB: windmill
     healthcheck:
       test: [ "CMD-SHELL", "pg_isready -U postgres" ]
diff --git a/env.host b/env.host
index 0e02552..287436b 100644
--- a/env.host
+++ b/env.host
@@ -1,4 +1,5 @@
 WM_IMAGE=ghcr.io/windmill-labs/windmill:main
-DATABASE_URL=postgresql://postgres:DbForWindMillPassword:5432/windmill
+POSTGRES_PASSWORD=MyS3cur3P@ssw0rd!2024
+DATABASE_URL=postgresql://postgres:${POSTGRES_PASSWORD}@db:5432/windmill
 LOG_MAX_SIZE=20m
 LOG_MAX_FILE=10