diff --git a/ci/test-aas-registry-kafka-mem.yml b/ci/test-aas-registry-kafka-mem.yml
index 0450e9e95..506450ed1 100644
--- a/ci/test-aas-registry-kafka-mem.yml
+++ b/ci/test-aas-registry-kafka-mem.yml
@@ -79,7 +79,7 @@ services:
 
   aas-registry-kafka-mem:
     image: test/aas-registry-kafka-mem:$BASYX_VERSION
-    container_name: test-aas-registry-kafka-mem
+    container_name: test_aas_registry_kafka_mem
     pull_policy: never
     ports:
       - "8030:8080"
diff --git a/ci/test-aas-registry-kafka-mongodb.yml b/ci/test-aas-registry-kafka-mongodb.yml
index bee06a510..487325eaf 100644
--- a/ci/test-aas-registry-kafka-mongodb.yml
+++ b/ci/test-aas-registry-kafka-mongodb.yml
@@ -94,7 +94,7 @@ services:
 
   aas-registry-kafka-mongodb:
     image: test/aas-registry-kafka-mongodb:$BASYX_VERSION
-    container_name: test-aas-registry-kafka-mongodb
+    container_name: test_aas_registry_kafka_mongodb
     pull_policy: never
     ports:
       - "8020:8080"
diff --git a/ci/test-aas-registry-log-mongodb.yml b/ci/test-aas-registry-log-mongodb.yml
index 3645ab529..8e2618c33 100644
--- a/ci/test-aas-registry-log-mongodb.yml
+++ b/ci/test-aas-registry-log-mongodb.yml
@@ -38,7 +38,7 @@ services:
 
   aas-registry-log-mongodb:
     image: test/aas-registry-log-mongodb:$BASYX_VERSION
-    container_name: test-aas-registry-log-mongodb
+    container_name: test_aas_registry_log_mongodb
     pull_policy: never
     ports:
       - "8050:8080"
diff --git a/ci/test-submodel-registry-kafka-mem.yml b/ci/test-submodel-registry-kafka-mem.yml
index 0a226f094..fa7c006f8 100644
--- a/ci/test-submodel-registry-kafka-mem.yml
+++ b/ci/test-submodel-registry-kafka-mem.yml
@@ -77,7 +77,7 @@ services:
 
   submodel-registry-kafka-mem:
     image: test/submodel-registry-kafka-mem:$BASYX_VERSION
-    container_name: test-submodel-registry-kafka-mem
+    container_name: test_submodel_registry_kafka_mem
     pull_policy: never
     ports:
       - "8035:8080"
diff --git a/ci/test-submodel-registry-kafka-mongodb.yml b/ci/test-submodel-registry-kafka-mongodb.yml
index 6a5f690b6..1ff9d3513 100644
--- a/ci/test-submodel-registry-kafka-mongodb.yml
+++ b/ci/test-submodel-registry-kafka-mongodb.yml
@@ -94,7 +94,7 @@ services:
 
   submodel-registry-kafka-mongodb:
     image: test/submodel-registry-kafka-mongodb:$BASYX_VERSION
-    container_name: test-submodel-registry-kafka-mongodb
+    container_name: test_submodel_registry_kafka_mongodb
     pull_policy: never
     ports:
       - "8024:8080"
diff --git a/ci/test-submodel-registry-log-mongodb.yml b/ci/test-submodel-registry-log-mongodb.yml
index 517513b42..2e2bb1fe0 100644
--- a/ci/test-submodel-registry-log-mongodb.yml
+++ b/ci/test-submodel-registry-log-mongodb.yml
@@ -94,7 +94,7 @@ services:
 
   submodel-registry-log-mongodb:
     image: test/submodel-registry-log-mongodb:$BASYX_VERSION
-    container_name: test-submodel-registry-log-mongodb
+    container_name: test_submodel_registry_log_mongodb
     pull_policy: never
     ports:
       - "8053:8080"