diff --git a/docker-compose/passbolt/docker-compose.yml b/docker-compose/passbolt/docker-compose.yml
index 0f367fc..e158117 100644
--- a/docker-compose/passbolt/docker-compose.yml
+++ b/docker-compose/passbolt/docker-compose.yml
@@ -5,9 +5,9 @@ services:
     restart: unless-stopped
     environment:
       MYSQL_RANDOM_ROOT_PASSWORD: "true"
-      MYSQL_DATABASE: "passbolt"
-      MYSQL_USER: "passbolt"
-      MYSQL_PASSWORD: "P4ssb0lt"
+      MYSQL_DATABASE: $MYSQL_DATABASE
+      MYSQL_USER: $MYSQL_USER
+      MYSQL_PASSWORD: $MYSQL_PASSWORD
     volumes:
       - database_volume:/var/lib/mysql
 
@@ -20,18 +20,18 @@ services:
       - db
     environment:
       # Replace API_FULL_BASE_URL with your real FQDN
-      APP_FULL_BASE_URL: https://passbolt.local
-      DATASOURCES_DEFAULT_HOST: "db"
-      DATASOURCES_DEFAULT_USERNAME: "passbolt"
-      DATASOURCES_DEFAULT_PASSWORD: "P4ssb0lt"
-      DATASOURCES_DEFAULT_DATABASE: "passbolt"
+      APP_FULL_BASE_URL: $APP_FULL_BASE_URL
+      DATASOURCES_DEFAULT_HOST: $DATASOURCES_DEFAULT_HOST
+      DATASOURCES_DEFAULT_USERNAME: $DATASOURCES_DEFAULT_USERNAME
+      DATASOURCES_DEFAULT_PASSWORD: $DATASOURCES_DEFAULT_PASSWORD
+      DATASOURCES_DEFAULT_DATABASE: $DATASOURCES_DEFAULT_DATABASE
       # Replace with your mail server config
-      # EMAIL_DEFAULT_FROM_NAME: "Passbolt"
-      # EMAIL_DEFAULT_FROM: "you@passbolt.local"
-      # EMAIL_TRANSPORT_DEFAULT_HOST: your-mail-server
+      # EMAIL_DEFAULT_FROM_NAME: $EMAIL_DEFAULT_FROM_NAME
+      # EMAIL_DEFAULT_FROM: $EMAIL_DEFAULT_FROM
+      # EMAIL_TRANSPORT_DEFAULT_HOST: $EMAIL_TRANSPORT_DEFAULT_HOST
       # EMAIL_TRANSPORT_DEFAULT_PORT: 587
-      # EMAIL_TRANSPORT_DEFAULT_USERNAME: your-mail-username
-      # EMAIL_TRANSPORT_DEFAULT_PASSWORD: your-mail-password
+      # EMAIL_TRANSPORT_DEFAULT_USERNAME: $EMAIL_TRANSPORT_DEFAULT_USERNAME
+      # EMAIL_TRANSPORT_DEFAULT_PASSWORD: $EMAIL_TRANSPORT_DEFAULT_PASSWORD
       # EMAIL_TRANSPORT_DEFAULT_TLS: true
     volumes:
       - gpg_volume:/etc/passbolt/gpg