diff --git a/docker-compose-mongo.yml b/docker-compose-mongo.yml
index b39b825..96b1b77 100644
--- a/docker-compose-mongo.yml
+++ b/docker-compose-mongo.yml
@@ -93,11 +93,10 @@ services:
 
       MONGO_SAMPLE_DATA_RELATIVE_PATH: ${MONGO_SAMPLE_DATA_RELATIVE_PATH:-./mongo/dump}
 
-      MONGO_INDEX_CREATE_ODE: ${MONGO_INDEX_CREATE_ODE:-true}
-      MONGO_INDEX_CREATE_GEOJSONCONVERTER: ${MONGO_INDEX_CREATE_GEOJSONCONVERTER:-true}
-      MONGO_INDEX_CREATE_CONFLICTMONITOR: ${MONGO_INDEX_CREATE_CONFLICTMONITOR:-true}
-      MONGO_INDEX_CREATE_DEDUPLICATOR: ${MONGO_INDEX_CREATE_DEDUPLICATOR:-false}
-      MONGO_INDEX_CREATE_INTERSECTION_API: ${MONGO_INDEX_CREATE_INTERSECTION_API:-true}
+      CONNECT_CREATE_ODE: ${CONNECT_CREATE_ODE:-true}
+      CONNECT_CREATE_GEOJSONCONVERTER: ${CONNECT_CREATE_GEOJSONCONVERTER:-true}
+      CONNECT_CREATE_CONFLICTMONITOR: ${CONNECT_CREATE_CONFLICTMONITOR:-true}
+      CONNECT_CREATE_DEDUPLICATOR: ${CONNECT_CREATE_DEDUPLICATOR:-false}
     entrypoint: ["/bin/bash", "-c", "./setup_mongo.sh && ./restore_mongo.sh"]
     volumes:
       - ${MONGO_SETUP_SCRIPT_RELATIVE_PATH:-./mongo/setup_mongo.sh}:/setup_mongo.sh
diff --git a/sample.env b/sample.env
index d5b610e..43f79c7 100644
--- a/sample.env
+++ b/sample.env
@@ -110,12 +110,6 @@ MONGO_DATABASE_COMPACTION_TRIGGER_PERCENT=MONGO_DATABASE_COMPACTION_TRIGGER_PERC
 MONGO_ENABLE_STORAGE_RECORD=true
 MONGO_ENABLE_DYNAMIC_TTL=true
 
-MONGO_INDEX_CREATE_ODE=true                 # Create indexes for ODE
-MONGO_INDEX_CREATE_GEOJSONCONVERTER=true    # Create indexes for GeoJSON Converter
-MONGO_INDEX_CREATE_CONFLICTMONITOR=true     # Create indexes for Conflict Monitor
-MONGO_INDEX_CREATE_DEDUPLICATOR=false       # Create indexes for Deduplicator
-MONGO_INDEX_CREATE_INTERSECTION_API=true    # Create indexes for Intersection API
-
 # Relative path to the MongoDB init script, upper level directories are supported
 MONGO_SETUP_SCRIPT_RELATIVE_PATH="./mongo/setup_mongo.sh"
 MONGO_RESTORE_SCRIPT_RELATIVE_PATH="./mongo/restore_mongo.sh"