diff --git a/passbolt/compose.yml b/passbolt/compose.yml
index bcc3b1c..01c262e 100644
--- a/passbolt/compose.yml
+++ b/passbolt/compose.yml
@@ -6,12 +6,16 @@ services:
       APP_FULL_BASE_URL: https://${TRAEFIK_HOST}
       PASSBOLT_SSL_FORCE: "false"
       PASSBOLT_REGISTRATION_PUBLIC: "false"
-      DATASOURCES_DEFAULT_HOST: db
+      PASSBOLT_GPG_SERVER_KEY_FINGERPRINT: 128A85D634C4FD9EA13CB76F115856561510E62F
+      PASSBOLT_GPG_SERVER_KEY_EMAIL: passbolt@pivoine.art
+      DATASOURCES_DEFAULT_HOST: passbolt_db
       DATASOURCES_DEFAULT_PORT: "5432"
       DATASOURCES_DEFAULT_DATABASE: passbolt
       DATASOURCES_DEFAULT_USERNAME: passbolt
       DATASOURCES_DEFAULT_PASSWORD: ${DB_PASSWORD}
       DATASOURCES_DEFAULT_DRIVER: Cake\Database\Driver\Postgres
+      DATASOURCES_DEFAULT_ENCODING: utf8
+      DATASOURCES_QUOTE_IDENTIFIER: "true"
       EMAIL_TRANSPORT_DEFAULT_HOST: mailpit
       EMAIL_TRANSPORT_DEFAULT_PORT: "1025"
       EMAIL_TRANSPORT_DEFAULT_TLS: "false"