diff --git a/deployment/docker-compose.yml b/deployment/docker-compose.yml
index 973dc6ac5..5236a7025 100644
--- a/deployment/docker-compose.yml
+++ b/deployment/docker-compose.yml
@@ -142,19 +142,35 @@ services:
       - 3001:80
 
   neo4j:
+    # Neo4j v3.5.14-community
+    # image: wollehuss/neo4j-community-branded:latest
+    # Neo4j 4.4-community
     image: ocelotsocialnetwork/neo4j-community:latest
     container_name: neo4j-branded
     networks:
       - test-network
+    ports:
+      - 7687:7687
+      # only for development
+      # - 7474:7474
+      - 7474:7474
     volumes:
       - neo4j_data:/data
     environment:
+      # 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_security_procedures_unrestricted=algo.*,apoc.*
-      - NEO4J_ACCEPT_LICENSE_AGREEMENT=yes
-    ports:
-      - 7687:7687
-      - 7474:7474
+      - NEO4J_dbms_allow__format__migration=true
+      - NEO4J_dbms_allow__upgrade=true
+      # TODO: clarify if that is the only thing needed to unlock the Enterprise version
+      # - NEO4J_ACCEPT_LICENSE_AGREEMENT=yes
+      # 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
+      # TODO: Remove the playground from production
+    # bring the database in offline mode to export or load dumps
+    # command: ["tail", "-f", "/dev/null"]
 
   mailserver:
     image: djfarrelly/maildev