diff --git a/docker-compose.yml b/docker-compose.yml
index 0afc680..e7aa001 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,11 +7,11 @@ services:
       - db
     environment:
       - TZ=Europe/Zurich
-      - POSTGRES_HOST=db
-      - POSTGRES_PORT=5432
-      - POSTGRES_DB=${DC_SPLIIT_DB:-spliit}
-      - POSTGRES_USER=${DC_SPLIIT_USER:-spliit}
-      - POSTGRES_PASSWORD=${DC_SPLIIT_PASS:?}
+      - POSTGRES_HOST=${DC_SPLIIT_POSTGRES_HOST:-db}
+      - POSTGRES_PORT=${DC_SPLIIT_POSTGRES_PORT:-5432}
+      - POSTGRES_DB=${DC_SPLIIT_POSTGRES_DB:-spliit}
+      - POSTGRES_USER=${DC_SPLIIT_POSTGRES_USER:-spliit}
+      - POSTGRES_PASSWORD=${DC_SPLIIT_POSTGRES_PASS:?}
     restart: always
     labels:
       - "traefik.enable=true"
@@ -26,9 +26,9 @@ services:
     image: postgres:17.5@sha256:6efd0df010dc3cb40d5e33e3ef84acecc5e73161bd3df06029ee8698e5e12c60
     environment:
       - TZ=Europe/Zurich
-      - POSTGRES_DB=${DC_SPLIIT_DB:-spliit}
-      - POSTGRES_USER=${DC_SPLIIT_USER:-spliit}
-      - POSTGRES_PASSWORD=${DC_SPLIIT_PASS:?}
+      - POSTGRES_DB=${DC_SPLIIT_POSTGRES_DB:-spliit}
+      - POSTGRES_USER=${DC_SPLIIT_POSTGRES_USER:-spliit}
+      - POSTGRES_PASSWORD=${DC_SPLIIT_POSTGRES_PASS:?}
     volumes:
       - postgres:/var/lib/postgresql/data
     restart: always