diff --git a/examples/BaSyxQueryLanguage/basyx/aas-env.properties b/examples/BaSyxQueryLanguage/basyx/aas-env.properties
index 1ac3a6855..abd6c7fac 100644
--- a/examples/BaSyxQueryLanguage/basyx/aas-env.properties
+++ b/examples/BaSyxQueryLanguage/basyx/aas-env.properties
@@ -21,5 +21,5 @@ basyx.aasrepository.feature.search.enabled=true
 basyx.aasrepository.feature.search.indexname=aas-index
 basyx.submodelrepository.feature.search.enabled=true
 basyx.submodelrepository.feature.search.indexname=sm-index
-basyx.conceptdescriptionrepository.feature.search.enabled=true
-basyx.conceptdescriptionrepository.feature.search.indexname=cd-index
+basyx.cdrepository.feature.search.enabled=true
+basyx.cdrepository.feature.search.indexname=cd-index
diff --git a/examples/BaSyxQueryLanguage/docker-compose.yml b/examples/BaSyxQueryLanguage/docker-compose.yml
index 16afb96cb..dfaaf6933 100644
--- a/examples/BaSyxQueryLanguage/docker-compose.yml
+++ b/examples/BaSyxQueryLanguage/docker-compose.yml
@@ -19,6 +19,8 @@ services:
         condition: service_healthy
       mongo:
         condition: service_healthy
+      elasticsearch:
+        condition: service_healthy
   aas-registry:
     image: eclipsebasyx/aas-registry-log-mongodb:2.0.0-SNAPSHOT
     container_name: aas-registry
@@ -32,6 +34,8 @@ services:
     depends_on:
       mongo:
         condition: service_healthy
+      elasticsearch:
+        condition: service_healthy
   sm-registry:
     image: eclipsebasyx/submodel-registry-log-mongodb:2.0.0-SNAPSHOT
     container_name: sm-registry
@@ -45,6 +49,8 @@ services:
     depends_on:
       mongo:
         condition: service_healthy
+      elasticsearch:
+        condition: service_healthy
   aas-discovery:
     image: eclipsebasyx/aas-discovery:2.0.0-SNAPSHOT
     container_name: aas-discovery
@@ -85,6 +91,6 @@ services:
       CD_REPO_PATH: http://localhost:8081/concept-descriptions
       AAS_DISCOVERY_PATH: http://localhost:8084/lookup/shells
     restart: always
-   # depends_on:
-    #  aas-env:
-    #    condition: service_healthy
+    depends_on:
+      aas-env:
+        condition: service_healthy