diff --git a/ci/docker-compose.yml b/ci/docker-compose.yml
index ff216c98d..7912aeb0a 100644
--- a/ci/docker-compose.yml
+++ b/ci/docker-compose.yml
@@ -81,6 +81,7 @@ services:
       - "8050:8080"
     environment:
       SERVER_SERVLET_CONTEXT_PATH: /
+      SERVER_PORT: 8080
     restart: always
     networks:
       - basyx-java-server-sdk
@@ -90,6 +91,7 @@ services:
     container_name: sm-registry-log-mem
     environment:
       SERVER_SERVLET_CONTEXT_PATH: /
+      SERVER_PORT: 8080
     ports:
       - "8060:8080"
     restart: always
@@ -103,6 +105,7 @@ services:
       - "8051:8080"
     environment:
       SERVER_SERVLET_CONTEXT_PATH: /
+      SERVER_PORT: 8080
       BASYX_CORS_ALLOWED_ORIGINS: '*'
       BASYX_CORS_ALLOWED_METHODS: GET,POST,PATCH,DELETE,PUT,OPTIONS,HEAD
       BASYX_FEATURE_AUTHORIZATION_ENABLED: true
@@ -121,6 +124,7 @@ services:
     container_name: secured-sm-registry-log-mem
     environment:
       SERVER_SERVLET_CONTEXT_PATH: /
+      SERVER_PORT: 8080
       BASYX_CORS_ALLOWED_ORIGINS: '*'
       BASYX_CORS_ALLOWED_METHODS: GET,POST,PATCH,DELETE,PUT,OPTIONS,HEAD
       BASYX_FEATURE_AUTHORIZATION_ENABLED: true
diff --git a/examples/BaSyxMinimal/docker-compose.yml b/examples/BaSyxMinimal/docker-compose.yml
index ed3b998c8..22e46c6cb 100644
--- a/examples/BaSyxMinimal/docker-compose.yml
+++ b/examples/BaSyxMinimal/docker-compose.yml
@@ -34,6 +34,8 @@ services:
       
   aas-env:
     image: eclipsebasyx/aas-environment:2.0.0-SNAPSHOT
+    environment:
+      - SERVER_PORT=8081
     volumes:
       - ./aas-env.properties:/application/application.properties
       - ./aas:/application/aas
@@ -53,6 +55,8 @@ services:
     image: eclipsebasyx/aas-registry-log-mongodb:2.0.0-SNAPSHOT
     ports:
       - 8082:8080
+    environment:
+      - SERVER_PORT=8080
     volumes:
       - ./aas-registry.yml:/workspace/config/application.yml
     depends_on:
@@ -63,6 +67,8 @@ services:
     image: eclipsebasyx/submodel-registry-log-mongodb:2.0.0-SNAPSHOT
     ports:
       - 8083:8080
+    environment:
+      - SERVER_PORT=8080
     volumes:
       - ./sm-registry.yml:/workspace/config/application.yml
     depends_on:
@@ -73,6 +79,8 @@ services:
     image: eclipsebasyx/aas-discovery:2.0.0-SNAPSHOT
     ports:
       - 8084:8081
+    environment:
+      - SERVER_PORT=8081
     volumes:
       - ./aas-discovery.properties:/application/application.properties
     depends_on:
diff --git a/examples/BaSyxNGINX/docker-compose.yml b/examples/BaSyxNGINX/docker-compose.yml
index e37379cfd..256ac09aa 100644
--- a/examples/BaSyxNGINX/docker-compose.yml
+++ b/examples/BaSyxNGINX/docker-compose.yml
@@ -26,6 +26,8 @@ services:
   aas-env:
     image: eclipsebasyx/aas-environment:2.0.0-SNAPSHOT
     container_name: aas-env
+    environment:
+      SERVER_PORT: 8081
     volumes:
       - ./basyx/aas-env.properties:/application/application.properties
       - ./aas:/application/aas
@@ -70,6 +72,8 @@ services:
     container_name: aas-discovery
     ports:
       - 8084:8081
+    environment:
+      SERVER_PORT: 8081
     volumes:
       - ./basyx/aas-discovery.properties:/application/application.properties
     restart: always
diff --git a/examples/BaSyxOperationDelegation/docker-compose.yml b/examples/BaSyxOperationDelegation/docker-compose.yml
index 61212e17d..1955ab840 100644
--- a/examples/BaSyxOperationDelegation/docker-compose.yml
+++ b/examples/BaSyxOperationDelegation/docker-compose.yml
@@ -3,6 +3,8 @@ services:
   aas-env:
     image: eclipsebasyx/aas-environment:2.0.0-milestone-02
     container_name: aas-env
+    environment:
+      - SERVER_PORT=8081
     volumes:
       - ./aas:/application/aas
       - ./basyx/aas-env.properties:/application/application.properties
@@ -19,6 +21,8 @@ services:
     container_name: aas-registry
     ports:
       - '8082:8080'
+    environment:
+      - SERVER_PORT=8080
     volumes:
       - ./basyx/aas-registry.yml:/workspace/config/application.yml
     restart: always
@@ -27,6 +31,8 @@ services:
     container_name: sm-registry
     ports:
       - '8083:8080'
+    environment:
+      - SERVER_PORT=8080
     volumes:
       - ./basyx/sm-registry.yml:/workspace/config/application.yml
     restart: always