diff --git a/passbolt/compose.yml b/passbolt/compose.yml
index b3b22dd..d950001 100644
--- a/passbolt/compose.yml
+++ b/passbolt/compose.yml
@@ -5,13 +5,13 @@ services:
     environment:
       APP_FULL_BASE_URL: https://${TRAEFIK_HOST}
       PASSBOLT_SSL_FORCE: "false"
+      TZ: ${TIMEZONE:-Europe/Amsterdam}
       PASSBOLT_REGISTRATION_PUBLIC: "false"
-      PASSBOLT_GPG_SERVER_KEY_FINGERPRINT: FB7EEFB9D6024E95E0F19A1768410AE75DD9F9B9
       DATASOURCES_DEFAULT_HOST: passbolt_db
       DATASOURCES_DEFAULT_PORT: "5432"
       DATASOURCES_DEFAULT_DATABASE: passbolt
       DATASOURCES_DEFAULT_USERNAME: passbolt
-      DATASOURCES_DEFAULT_PASSWORD: ${DB_PASSWORD}
+      DATASOURCES_DEFAULT_PASSWORD: passbolt
       DATASOURCES_DEFAULT_DRIVER: Cake\Database\Driver\Postgres
       DATASOURCES_DEFAULT_ENCODING: utf8
       DATASOURCES_QUOTE_IDENTIFIER: "true"
@@ -47,7 +47,7 @@ services:
     environment:
       POSTGRES_DB: passbolt
       POSTGRES_USER: passbolt
-      POSTGRES_PASSWORD: ${DB_PASSWORD}
+      POSTGRES_PASSWORD: passbolt
       POSTGRES_INITDB_ARGS: --data-checksums
     volumes:
       - ../.data/passbolt/db:/var/lib/postgresql/data