diff --git a/deployment/docker-compose.yml b/deployment/docker-compose.yml
index 5236a7025..e66b41f9f 100644
--- a/deployment/docker-compose.yml
+++ b/deployment/docker-compose.yml
@@ -168,6 +168,9 @@ services:
       # Uncomment following line for Neo4j Enterprise version instead of Community version
       # TODO: clarify if that is the only thing needed to unlock the Enterprise version
       # - NEO4J_ACCEPT_LICENSE_AGREEMENT=yes
+      # set the name of the database to be used
+      # - NEO4J_dbms_default__database=graph.db
+      # - NEO4J_dbms_default__database=neo4j
       # TODO: Remove the playground from production
     # bring the database in offline mode to export or load dumps
     # command: ["tail", "-f", "/dev/null"]
diff --git a/deployment/src/kubernetes/templates/neo4j/ConfigMap.yml b/deployment/src/kubernetes/templates/neo4j/ConfigMap.yml
index f71f11285..677218c16 100644
--- a/deployment/src/kubernetes/templates/neo4j/ConfigMap.yml
+++ b/deployment/src/kubernetes/templates/neo4j/ConfigMap.yml
@@ -20,4 +20,5 @@ data:
   NEO4J_dbms_security_procedures_unrestricted: "{{ .Values.NEO4J.DBMS_SECURITY_PROCEDURES_UNRESTRICTED }}"
   NEO4J_dbms_allow__format__migration: "true"
   NEO4J_dbms_allow__upgrade: "true"
-  NEO4J_apoc_import_file_enabled: "{{ .Values.NEO4J.APOC_IMPORT_FILE_ENABLED }}" 
\ No newline at end of file
+  NEO4J_dbms_default__database: "{{ .Values.NEO4J.DBMS_DEFAULT_DATABASE }}"
+  NEO4J_apoc_import_file_enabled: "{{ .Values.NEO4J.APOC_IMPORT_FILE_ENABLED }}"
diff --git a/docker-compose.yml b/docker-compose.yml
index 7954e2bab..a2fff7e16 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -111,14 +111,15 @@ services:
       # settings reference: https://neo4j.com/docs/operations-manual/4.4/docker/ref-settings/
       # TODO: This sounds scary for a production environment
       - NEO4J_AUTH=none
-      # - NEO4J_dbms_default__database=graph.db
-      # - NEO4J_dbms_default__database=neo4j
       - NEO4J_dbms_security_procedures_unrestricted=algo.*,apoc.*
       - NEO4J_dbms_allow__format__migration=true
       - NEO4J_dbms_allow__upgrade=true
       # uncomment following line for Neo4j Enterprise version instead of Community version
       # TODO: clarify if that is the only thing needed to unlock the Enterprise version
       # - NEO4J_ACCEPT_LICENSE_AGREEMENT=yes
+      # set the name of the database to be used
+      # - NEO4J_dbms_default__database=graph.db
+      # - NEO4J_dbms_default__database=neo4j
       # TODO: Remove the playground from production
     # bring the database in offline mode to export or load dumps
     # command: ["tail", "-f", "/dev/null"]