diff --git a/README.md b/README.md
index 94be893..548f110 100644
--- a/README.md
+++ b/README.md
@@ -86,6 +86,7 @@ Passbolt docker image provides several environment variables to configure differ
 | DATASOURCES_DEFAULT_SSL_KEY         | Database SSL Key                 | '' |
 | DATASOURCES_DEFAULT_SSL_CERT        | Database SSL Cert                | '' |
 | DATASOURCES_DEFAULT_SSL_CA          | Database SSL CA                  | '' |
+| DATASOURCES_QUOTE_IDENTIFIER        | Enable database quoting ([needed for for MySQL 8+](https://github.com/passbolt/passbolt_api/issues/325)) | false |
 | EMAIL_TRANSPORT_DEFAULT_CLASS_NAME  | Email classname                  | Smtp |
 | EMAIL_DEFAULT_FROM                  | From email address               | you@localhost |
 | EMAIL_DEFAULT_TRANSPORT             | Sets transport method            | default |
diff --git a/env/passbolt.env b/env/passbolt.env
index 1f0ec57..ce7f723 100644
--- a/env/passbolt.env
+++ b/env/passbolt.env
@@ -7,6 +7,7 @@ DATASOURCES_DEFAULT_USERNAME=passbolt
 DATASOURCES_DEFAULT_PASSWORD=P4ssb0lt
 DATASOURCES_DEFAULT_DATABASE=passbolt
 DATASOURCES_DEFAULT_PORT=3306
+DATASOURCES_QUOTE_IDENTIFIER=true
 
 # Registration
 PASSBOLT_REGISTRATION_PUBLIC=true