diff --git a/.github/workflows/docker_test.yml b/.github/workflows/docker_test.yml
index 493891620..cc03bf28b 100644
--- a/.github/workflows/docker_test.yml
+++ b/.github/workflows/docker_test.yml
@@ -23,7 +23,7 @@ on:
       - 'NOTICE'
 
 env:
-  VERSION: 2.0.0-SNAPSHOT
+  VERSION: 2.0.0-milestone-04
   MVN_ARGS_BUILD_BASYX_NO_TESTS: -DskipTests
 
 jobs:
@@ -229,7 +229,7 @@ jobs:
           mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.aasregistry-service-release-kafka-mem"
 
       - name: Test AAS Registry Kafka Mem Docker Image
-        run: chmod +x ./.github/workflows/scripts/build_start_docker_image_docker_compose.sh && ./.github/workflows/scripts/build_start_docker_image_docker_compose.sh ./ci/test-aas-registry-kafka-mem.yml test_aas_registry_kafka_mem
+        run: chmod +x ./.github/workflows/scripts/build_start_docker_image_docker_compose.sh && ./.github/workflows/scripts/build_start_docker_image_docker_compose.sh ./ci/workflows/test-aas-registry-kafka-mem.yml test_aas_registry_kafka_mem
 
       - name: Clean up
         run: exit 0
@@ -255,7 +255,7 @@ jobs:
           mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.aasregistry-service-release-kafka-mongodb"
 
       - name: Test AAS Registry Kafka MongoDB Docker Image
-        run: chmod +x ./.github/workflows/scripts/build_start_docker_image_docker_compose.sh && ./.github/workflows/scripts/build_start_docker_image_docker_compose.sh ./ci/test-aas-registry-kafka-mongodb.yml test_aas_registry_kafka_mongodb
+        run: chmod +x ./.github/workflows/scripts/build_start_docker_image_docker_compose.sh && ./.github/workflows/scripts/build_start_docker_image_docker_compose.sh ./ci/workflows/test-aas-registry-kafka-mongodb.yml test_aas_registry_kafka_mongodb
 
       - name: Clean up
         run: exit 0
@@ -307,7 +307,7 @@ jobs:
           mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.aasregistry-service-release-log-mongodb"
 
       - name: Test AAS Registry Log MongoDB Docker Image
-        run: chmod +x ./.github/workflows/scripts/build_start_docker_image_docker_compose.sh && ./.github/workflows/scripts/build_start_docker_image_docker_compose.sh ./ci/test-aas-registry-log-mongodb.yml test_aas_registry_log_mongodb
+        run: chmod +x ./.github/workflows/scripts/build_start_docker_image_docker_compose.sh && ./.github/workflows/scripts/build_start_docker_image_docker_compose.sh ./ci/workflows/test-aas-registry-log-mongodb.yml test_aas_registry_log_mongodb
 
       - name: Clean up
         run: exit 0
@@ -333,7 +333,7 @@ jobs:
           mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.submodelregistry-service-release-kafka-mem"
 
       - name: Test Submodel Registry Kafka Mem Docker Image
-        run: chmod +x ./.github/workflows/scripts/build_start_docker_image_docker_compose.sh && ./.github/workflows/scripts/build_start_docker_image_docker_compose.sh ./ci/test-submodel-registry-kafka-mem.yml test_submodel_registry_kafka_mem
+        run: chmod +x ./.github/workflows/scripts/build_start_docker_image_docker_compose.sh && ./.github/workflows/scripts/build_start_docker_image_docker_compose.sh ./ci/workflows/test-submodel-registry-kafka-mem.yml test_submodel_registry_kafka_mem
 
       - name: Clean up
         run: exit 0
@@ -359,7 +359,7 @@ jobs:
           mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.submodelregistry-service-release-kafka-mongodb"
 
       - name: Test Submodel Registry Kafka MongoDB Docker Image
-        run: chmod +x ./.github/workflows/scripts/build_start_docker_image_docker_compose.sh && ./.github/workflows/scripts/build_start_docker_image_docker_compose.sh ./ci/test-submodel-registry-kafka-mongodb.yml test_submodel_registry_kafka_mongodb
+        run: chmod +x ./.github/workflows/scripts/build_start_docker_image_docker_compose.sh && ./.github/workflows/scripts/build_start_docker_image_docker_compose.sh ./ci/workflows/test-submodel-registry-kafka-mongodb.yml test_submodel_registry_kafka_mongodb
 
       - name: Clean up
         run: exit 0
@@ -411,7 +411,7 @@ jobs:
           mvn package -DskipTests -Ddocker.namespace=test --pl "org.eclipse.digitaltwin.basyx:basyx.submodelregistry-service-release-log-mongodb"
 
       - name: Test Submodel Registry Log MongoDB Docker Image
-        run: chmod +x ./.github/workflows/scripts/build_start_docker_image_docker_compose.sh && ./.github/workflows/scripts/build_start_docker_image_docker_compose.sh ./ci/test-submodel-registry-log-mongodb.yml test_submodel_registry_log_mongodb
+        run: chmod +x ./.github/workflows/scripts/build_start_docker_image_docker_compose.sh && ./.github/workflows/scripts/build_start_docker_image_docker_compose.sh ./ci/workflows/test-submodel-registry-log-mongodb.yml test_submodel_registry_log_mongodb
 
       - name: Clean up
         run: exit 0
diff --git a/ci/workflows/.env b/ci/workflows/.env
new file mode 100644
index 000000000..7002f6894
--- /dev/null
+++ b/ci/workflows/.env
@@ -0,0 +1,3 @@
+BASYX_VERSION=2.0.0-milestone-04
+AAS_WEBUI_VERSION=v2-240125
+KEYCLOAK_VERSION=24.0.4
diff --git a/ci/test-aas-registry-kafka-mem.yml b/ci/workflows/test-aas-registry-kafka-mem.yml
similarity index 100%
rename from ci/test-aas-registry-kafka-mem.yml
rename to ci/workflows/test-aas-registry-kafka-mem.yml
diff --git a/ci/test-aas-registry-kafka-mongodb.yml b/ci/workflows/test-aas-registry-kafka-mongodb.yml
similarity index 100%
rename from ci/test-aas-registry-kafka-mongodb.yml
rename to ci/workflows/test-aas-registry-kafka-mongodb.yml
diff --git a/ci/test-aas-registry-log-mongodb.yml b/ci/workflows/test-aas-registry-log-mongodb.yml
similarity index 100%
rename from ci/test-aas-registry-log-mongodb.yml
rename to ci/workflows/test-aas-registry-log-mongodb.yml
diff --git a/ci/test-submodel-registry-kafka-mem.yml b/ci/workflows/test-submodel-registry-kafka-mem.yml
similarity index 100%
rename from ci/test-submodel-registry-kafka-mem.yml
rename to ci/workflows/test-submodel-registry-kafka-mem.yml
diff --git a/ci/test-submodel-registry-kafka-mongodb.yml b/ci/workflows/test-submodel-registry-kafka-mongodb.yml
similarity index 100%
rename from ci/test-submodel-registry-kafka-mongodb.yml
rename to ci/workflows/test-submodel-registry-kafka-mongodb.yml
diff --git a/ci/test-submodel-registry-log-mongodb.yml b/ci/workflows/test-submodel-registry-log-mongodb.yml
similarity index 100%
rename from ci/test-submodel-registry-log-mongodb.yml
rename to ci/workflows/test-submodel-registry-log-mongodb.yml
diff --git a/pom.xml b/pom.xml
index ea8092ff2..f27d08197 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
 		<java.version>17</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<revision>2.0.0-SNAPSHOT</revision>
+		<revision>2.0.0-milestone-04</revision>
 		<docker.provenance />
 		<docker.namespace>eclipsebasyx</docker.namespace>
 		<docker.image.name>NOT_DEFINED_IN_MODULE</docker.image.name>