diff --git a/.env b/.env
index 4c4e05c..86a7fbf 100644
--- a/.env
+++ b/.env
@@ -3,7 +3,7 @@ API_LOCAL_PORT=8080
 API_DOCKER_PORT=8080
 
 #Postgres port
-POSTGRES_LOCAL_PORT=5432
+POSTGRES_LOCAL_PORT=5434
 POSTGRES_DOCKER_PORT=5432
 
 #Database name (change this!)
@@ -13,6 +13,8 @@ DATABASE_USER=admin
 #Database user password (change this!)
 DATABASE_PASSWORD=adminpass
 DATABASE_USE_SSL=false
+#postgres user password (CHANGE THIS!)
+POSTGRES_DEFAULT_PASSWORD_ENV=admin
 
 #Deafult webservice admin username (change this!)
 DEFAULT_ADMIN_USERNAME=admin
diff --git a/docker-compose.yml b/docker-compose.yml
index a668968..df280ef 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,7 +32,7 @@ services:
       - $POSTGRES_DOCKER_PORT
     environment:
       - POSTGRES_USER=postgres
-      - POSTGRES_PASSWORD=admin
+      - POSTGRES_PASSWORD=$POSTGRES_DEFAULT_PASSWORD_ENV
       - POSTGRES_DB_PASSWORD=$DATABASE_PASSWORD
       - POSTGRES_DB_USER=$DATABASE_USER
       - POSTGRES_DB_NAME=$DATABASE_NAME