diff --git a/docker-compose-home.yml b/docker-compose-home.yml
index 2e58413..e6b7d09 100644
--- a/docker-compose-home.yml
+++ b/docker-compose-home.yml
@@ -264,8 +264,8 @@ services:
         condition: any
     image: ${LOCAL_DOCKER_REGISTRY}guacamole-postgresql:latest
     environment:
-      POSTGRES_PASSWORD: guacroot
-      POSTGRES_DB: guacamole_db
+      POSTGRES_PASSWORD: ${GUACAMOLE_POSTGRES_PASSWORD}
+      POSTGRES_DB: ${GUACAMOLE_POSTGRES_DB}
     volumes:
       - guacamole-postgresql-data:/var/lib/postgresql/data
     networks:
@@ -291,19 +291,12 @@ services:
       restart_policy:
         condition: any
     image: guacamole/guacamole:latest
-    secrets:
-      - source: guacamole-postgresql-database
-        target: database
-      - source: guacamole-postgresql-user
-        target: user
-      - source: guacamole-postgresql-password
-        target: password
     environment:
       - POSTGRES_HOSTNAME=guacamole-postgresql
       - POSTGRES_PORT=5432
-      - POSTGRES_USER_FILE=/run/secrets/user
-      - POSTGRES_PASSWORD_FILE=/run/secrets/password
-      - POSTGRES_DATABASE_FILE=/run/secrets/database
+      - POSTGRES_USER=${GUACAMOLE_POSTGRES_USER}
+      - POSTGRES_PASSWORD=${GUACAMOLE_POSTGRES_PASSWORD}
+      - POSTGRES_DATABASE=${GUACAMOLE_POSTGRES_DB}
       - GUACD_HOSTNAME=guacd
     networks:
       - appnet
@@ -379,11 +372,5 @@ secrets:
     file: .certificates/registry.crt
   'registry-key':
     file: .certificates/registry.key
-  'guacamole-postgresql-database':
-    file: .secrets/guacamole-postgresql-database
-  'guacamole-postgresql-user':
-    file: .secrets/guacamole-postgresql-user
-  'guacamole-postgresql-password':
-    file: .secrets/guacamole-postgresql-password
   'ngrok-auth-token':
     file: .secrets/ngrok-auth-token
diff --git a/docker-compose-remote.yml b/docker-compose-remote.yml
index 04e0f1e..f4f11ac 100644
--- a/docker-compose-remote.yml
+++ b/docker-compose-remote.yml
@@ -178,8 +178,8 @@ services:
         condition: any
     image: ${LOCAL_DOCKER_REGISTRY}guacamole-postgresql:latest
     environment:
-      POSTGRES_PASSWORD: guacroot
-      POSTGRES_DB: guacamole_db
+      POSTGRES_PASSWORD: ${GUACAMOLE_POSTGRES_PASSWORD}
+      POSTGRES_DB: ${GUACAMOLE_POSTGRES_DB}
     volumes:
       - guacamole-postgresql-data:/var/lib/postgresql/data
     #secrets:
@@ -220,9 +220,9 @@ services:
     environment:
       - POSTGRES_HOSTNAME=guacamole-postgresql
       - POSTGRES_PORT=5432
-      - POSTGRES_USER_FILE=/run/secrets/user
-      - POSTGRES_PASSWORD_FILE=/run/secrets/password
-      - POSTGRES_DATABASE_FILE=/run/secrets/database
+      - POSTGRES_USER=${GUACAMOLE_POSTGRES_USER}
+      - POSTGRES_PASSWORD=${GUACAMOLE_POSTGRES_PASSWORD}
+      - POSTGRES_DATABASE=${GUACAMOLE_POSTGRES_DB}
       - GUACD_HOSTNAME=guacd
     networks:
       - appnet