diff --git a/templates/compose/windmill.yaml b/templates/compose/windmill.yaml
index 32f9a23e8..366adb9c4 100644
--- a/templates/compose/windmill.yaml
+++ b/templates/compose/windmill.yaml
@@ -15,7 +15,7 @@ services:
     volumes:
       - db_data:/var/lib/postgresql/data
     environment:
-      POSTGRES_PASSWORD: $SERVICE_PASSWORD_WINDMILL_POSTGRES
+      POSTGRES_PASSWORD: $SERVICE_PASSWORD_POSTGRES
       POSTGRES_DB: windmill
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U postgres"]
@@ -26,8 +26,8 @@ services:
   windmill_server:
     image: ghcr.io/windmill-labs/windmill:main
     environment:
-      - SERVICE_FQDN_WINDMILL
-      - DATABASE_URL=postgres://postgres:$SERVICE_PASSWORD_WINDMILL_POSTGRES@db/windmill
+      - SERVICE_FQDN_WINDMILL_8000
+      - DATABASE_URL=postgres://postgres:$SERVICE_PASSWORD_POSTGRES@db/windmill
       - MODE=server
       - BASE_URL=$SERVICE_FQDN_WINDMILL
     depends_on:
@@ -39,7 +39,7 @@ services:
   windmill_worker_1:
     image: ghcr.io/windmill-labs/windmill:main
     environment:
-      - DATABASE_URL=postgres://postgres:$SERVICE_PASSWORD_WINDMILL_POSTGRES@db/windmill
+      - DATABASE_URL=postgres://postgres:$SERVICE_PASSWORD_POSTGRES@db/windmill
       - MODE=worker
       - WORKER_GROUP=default
     depends_on:
@@ -53,7 +53,7 @@ services:
   windmill_worker_2:
     image: ghcr.io/windmill-labs/windmill:main
     environment:
-      - DATABASE_URL=postgres://postgres:$SERVICE_PASSWORD_WINDMILL_POSTGRES@db/windmill
+      - DATABASE_URL=postgres://postgres:$SERVICE_PASSWORD_POSTGRES@db/windmill
       - MODE=worker
       - WORKER_GROUP=default
     depends_on:
@@ -67,7 +67,7 @@ services:
   windmill_worker_3:
     image: ghcr.io/windmill-labs/windmill:main
     environment:
-      - DATABASE_URL=postgres://postgres:$SERVICE_PASSWORD_WINDMILL_POSTGRES@db/windmill
+      - DATABASE_URL=postgres://postgres:$SERVICE_PASSWORD_POSTGRES@db/windmill
       - MODE=worker
       - WORKER_GROUP=default
     depends_on:
@@ -81,7 +81,7 @@ services:
   windmill_worker_native:
     image: ghcr.io/windmill-labs/windmill:main
     environment:
-      - DATABASE_URL=postgres://postgres:$SERVICE_PASSWORD_WINDMILL_POSTGRES@db/windmill
+      - DATABASE_URL=postgres://postgres:$SERVICE_PASSWORD_POSTGRES@db/windmill
       - MODE=worker
       - WORKER_GROUP=native
       - NUM_WORKERS=8