diff --git a/examples/guacamole/docker-compose.yml b/examples/guacamole/docker-compose.yml
index e0c7f3b..be97745 100644
--- a/examples/guacamole/docker-compose.yml
+++ b/examples/guacamole/docker-compose.yml
@@ -19,8 +19,8 @@ services:
     environment:
       - PGDATA=/var/lib/postgresql/data/guacamole
       - POSTGRES_DB=guacamole_db
-      - POSTGRES_PASSWORD=ChooseYourOwnPasswordHere1234
       - POSTGRES_USER=guacamole_user
+      - POSTGRES_PASSWORD=ChooseYourOwnPasswordHere1234      
     volumes:
       - ${DOCKER_VOLUME_STORAGE:-/mnt/docker-volumes}/guacamole/psql/init:/docker-entrypoint-initdb.d:z
       - ${DOCKER_VOLUME_STORAGE:-/mnt/docker-volumes}/guacamole/psql/data:/var/lib/postgresql/data:Z
@@ -37,10 +37,10 @@ services:
       - postgres
     environment:
       - GUACD_HOSTNAME=guacd
-      - POSTGRES_DATABASE=guacamole_db
-      - POSTGRES_HOSTNAME=postgres
-      - POSTGRES_PASSWORD=ChooseYourOwnPasswordHere1234
-      - POSTGRES_USER=guacamole_user
+      - POSTGRESQL_HOSTNAME=postgres      
+      - POSTGRESQL_DATABASE=guacamole_db
+      - POSTGRESQL_USER=guacamole_user
+      - POSTGRESQL_PASSWORD=ChooseYourOwnPasswordHere1234
     links:
       - guacd
     ports: