diff --git a/deployment/src/kubernetes/templates/neo4j/ConfigMap.yml b/deployment/src/kubernetes/templates/neo4j/ConfigMap.yml
index 9f0aa4bee..10edc50f7 100644
--- a/deployment/src/kubernetes/templates/neo4j/ConfigMap.yml
+++ b/deployment/src/kubernetes/templates/neo4j/ConfigMap.yml
@@ -18,4 +18,6 @@ data:
   NEO4J_dbms_memory_heap_max__size: "{{ .Values.NEO4J.DBMS_MEMORY_HEAP_MAX_SIZE }}"
   NEO4J_dbms_memory_pagecache_size: "{{ .Values.NEO4J.DBMS_MEMORY_PAGECACHE_SIZE }}"
   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
diff --git a/docker-compose.yml b/docker-compose.yml
index 759986d25..1f4e4646f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -112,8 +112,8 @@ services:
       - NEO4J_AUTH=none
       - NEO4J_dbms_security_procedures_unrestricted=algo.*,apoc.*
       - NEO4J_dbms_connector_http_listen__address=:7474
-      - NEO4J_dbms_allow__format__migration=true # TODO enable this in kubernetes setup
-      - NEO4J_dbms_allow__upgrade=true # TODO enable this in kubernetes setup
+      - 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