diff --git a/basyx.aasdiscoveryservice/basyx.aasdiscoveryservice.component/Dockerfile b/basyx.aasdiscoveryservice/basyx.aasdiscoveryservice.component/Dockerfile
index 1c3e9648d..2af59d73c 100644
--- a/basyx.aasdiscoveryservice/basyx.aasdiscoveryservice.component/Dockerfile
+++ b/basyx.aasdiscoveryservice/basyx.aasdiscoveryservice.component/Dockerfile
@@ -4,8 +4,6 @@ WORKDIR /application
 ARG JAR_FILE=target/*-exec.jar
 COPY ${JAR_FILE} basyxExecutable.jar
 COPY src/main/resources/application.properties application.properties
-ARG PORT=8081
-ENV SERVER_PORT=${PORT}
 EXPOSE ${SERVER_PORT}
 HEALTHCHECK --interval=30s --timeout=3s --retries=3 --start-period=15s CMD curl --fail http://localhost:${SERVER_PORT}/actuator/health || exit 1
 ENTRYPOINT ["java","-jar","basyxExecutable.jar"]
diff --git a/basyx.aasenvironment/basyx.aasenvironment.component/Dockerfile b/basyx.aasenvironment/basyx.aasenvironment.component/Dockerfile
index 1c3e9648d..2af59d73c 100644
--- a/basyx.aasenvironment/basyx.aasenvironment.component/Dockerfile
+++ b/basyx.aasenvironment/basyx.aasenvironment.component/Dockerfile
@@ -4,8 +4,6 @@ WORKDIR /application
 ARG JAR_FILE=target/*-exec.jar
 COPY ${JAR_FILE} basyxExecutable.jar
 COPY src/main/resources/application.properties application.properties
-ARG PORT=8081
-ENV SERVER_PORT=${PORT}
 EXPOSE ${SERVER_PORT}
 HEALTHCHECK --interval=30s --timeout=3s --retries=3 --start-period=15s CMD curl --fail http://localhost:${SERVER_PORT}/actuator/health || exit 1
 ENTRYPOINT ["java","-jar","basyxExecutable.jar"]
diff --git a/basyx.aasregistry/basyx.aasregistry-service-release-kafka-mem/src/main/docker/Dockerfile b/basyx.aasregistry/basyx.aasregistry-service-release-kafka-mem/src/main/docker/Dockerfile
index 31915dec7..d903433a5 100644
--- a/basyx.aasregistry/basyx.aasregistry-service-release-kafka-mem/src/main/docker/Dockerfile
+++ b/basyx.aasregistry/basyx.aasregistry-service-release-kafka-mem/src/main/docker/Dockerfile
@@ -11,8 +11,6 @@ RUN true
 COPY --from=builder spring-boot-loader/ ./
 COPY --from=builder application/ ./
 ENV SPRING_PROFILES_ACTIVE=kafkaEvents,inMemoryStorage
-ARG PORT=8080
-ENV SERVER_PORT=${PORT}
 ARG CONTEXT_PATH=/
 ENV SERVER_SERVLET_CONTEXT_PATH=${CONTEXT_PATH}
 EXPOSE ${SERVER_PORT}
diff --git a/basyx.aasregistry/basyx.aasregistry-service-release-kafka-mongodb/src/main/docker/Dockerfile b/basyx.aasregistry/basyx.aasregistry-service-release-kafka-mongodb/src/main/docker/Dockerfile
index 65024b26e..47ae34ae9 100644
--- a/basyx.aasregistry/basyx.aasregistry-service-release-kafka-mongodb/src/main/docker/Dockerfile
+++ b/basyx.aasregistry/basyx.aasregistry-service-release-kafka-mongodb/src/main/docker/Dockerfile
@@ -11,8 +11,6 @@ RUN true
 COPY --from=builder spring-boot-loader/ ./
 COPY --from=builder application/ ./
 ENV SPRING_PROFILES_ACTIVE=kafkaEvents,mongoDbStorage
-ARG PORT=8080
-ENV SERVER_PORT=${PORT}
 ARG CONTEXT_PATH=/
 ENV SERVER_SERVLET_CONTEXT_PATH=${CONTEXT_PATH}
 EXPOSE ${SERVER_PORT}
diff --git a/basyx.aasregistry/basyx.aasregistry-service-release-log-mem/src/main/docker/Dockerfile b/basyx.aasregistry/basyx.aasregistry-service-release-log-mem/src/main/docker/Dockerfile
index 57ae2024c..12ff102f0 100644
--- a/basyx.aasregistry/basyx.aasregistry-service-release-log-mem/src/main/docker/Dockerfile
+++ b/basyx.aasregistry/basyx.aasregistry-service-release-log-mem/src/main/docker/Dockerfile
@@ -11,8 +11,6 @@ RUN true
 COPY --from=builder spring-boot-loader/ ./
 COPY --from=builder application/ ./
 ENV SPRING_PROFILES_ACTIVE=logEvents,inMemoryStorage
-ARG PORT=8080
-ENV SERVER_PORT=${PORT}
 ARG CONTEXT_PATH=/
 ENV SERVER_SERVLET_CONTEXT_PATH=${CONTEXT_PATH}
 EXPOSE ${SERVER_PORT}
diff --git a/basyx.aasregistry/basyx.aasregistry-service-release-log-mongodb/src/main/docker/Dockerfile b/basyx.aasregistry/basyx.aasregistry-service-release-log-mongodb/src/main/docker/Dockerfile
index 69f0bb66d..3f541de3e 100644
--- a/basyx.aasregistry/basyx.aasregistry-service-release-log-mongodb/src/main/docker/Dockerfile
+++ b/basyx.aasregistry/basyx.aasregistry-service-release-log-mongodb/src/main/docker/Dockerfile
@@ -11,8 +11,6 @@ RUN true
 COPY --from=builder spring-boot-loader/ ./
 COPY --from=builder application/ ./
 ENV SPRING_PROFILES_ACTIVE=logEvents,mongoDbStorage
-ARG PORT=8080
-ENV SERVER_PORT=${PORT}
 ARG CONTEXT_PATH=/
 ENV SERVER_SERVLET_CONTEXT_PATH=${CONTEXT_PATH}
 EXPOSE ${SERVER_PORT}
diff --git a/basyx.aasrepository/basyx.aasrepository.component/Dockerfile b/basyx.aasrepository/basyx.aasrepository.component/Dockerfile
index 1c3e9648d..2af59d73c 100644
--- a/basyx.aasrepository/basyx.aasrepository.component/Dockerfile
+++ b/basyx.aasrepository/basyx.aasrepository.component/Dockerfile
@@ -4,8 +4,6 @@ WORKDIR /application
 ARG JAR_FILE=target/*-exec.jar
 COPY ${JAR_FILE} basyxExecutable.jar
 COPY src/main/resources/application.properties application.properties
-ARG PORT=8081
-ENV SERVER_PORT=${PORT}
 EXPOSE ${SERVER_PORT}
 HEALTHCHECK --interval=30s --timeout=3s --retries=3 --start-period=15s CMD curl --fail http://localhost:${SERVER_PORT}/actuator/health || exit 1
 ENTRYPOINT ["java","-jar","basyxExecutable.jar"]
diff --git a/basyx.aasxfileserver/basyx.aasxfileserver.component/Dockerfile b/basyx.aasxfileserver/basyx.aasxfileserver.component/Dockerfile
index 1c3e9648d..2af59d73c 100644
--- a/basyx.aasxfileserver/basyx.aasxfileserver.component/Dockerfile
+++ b/basyx.aasxfileserver/basyx.aasxfileserver.component/Dockerfile
@@ -4,8 +4,6 @@ WORKDIR /application
 ARG JAR_FILE=target/*-exec.jar
 COPY ${JAR_FILE} basyxExecutable.jar
 COPY src/main/resources/application.properties application.properties
-ARG PORT=8081
-ENV SERVER_PORT=${PORT}
 EXPOSE ${SERVER_PORT}
 HEALTHCHECK --interval=30s --timeout=3s --retries=3 --start-period=15s CMD curl --fail http://localhost:${SERVER_PORT}/actuator/health || exit 1
 ENTRYPOINT ["java","-jar","basyxExecutable.jar"]
diff --git a/basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository.component/Dockerfile b/basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository.component/Dockerfile
index 850188a4c..15179d0ba 100644
--- a/basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository.component/Dockerfile
+++ b/basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository.component/Dockerfile
@@ -4,8 +4,6 @@ WORKDIR /application
 ARG JAR_FILE=target/*-exec.jar
 COPY ${JAR_FILE} basyxExecutable.jar
 COPY src/main/resources/application.properties application.properties
-ARG PORT=8081
-ENV SERVER_PORT=${PORT}
 EXPOSE ${SERVER_PORT}
 HEALTHCHECK --interval=30s --timeout=3s --retries=3 --start-period=30s CMD curl --fail http://localhost:${SERVER_PORT}/actuator/health || exit 1
 ENTRYPOINT ["java","-jar","basyxExecutable.jar"]
diff --git a/basyx.submodelregistry/basyx.submodelregistry-service-release-kafka-mem/src/main/docker/Dockerfile b/basyx.submodelregistry/basyx.submodelregistry-service-release-kafka-mem/src/main/docker/Dockerfile
index 31915dec7..d903433a5 100644
--- a/basyx.submodelregistry/basyx.submodelregistry-service-release-kafka-mem/src/main/docker/Dockerfile
+++ b/basyx.submodelregistry/basyx.submodelregistry-service-release-kafka-mem/src/main/docker/Dockerfile
@@ -11,8 +11,6 @@ RUN true
 COPY --from=builder spring-boot-loader/ ./
 COPY --from=builder application/ ./
 ENV SPRING_PROFILES_ACTIVE=kafkaEvents,inMemoryStorage
-ARG PORT=8080
-ENV SERVER_PORT=${PORT}
 ARG CONTEXT_PATH=/
 ENV SERVER_SERVLET_CONTEXT_PATH=${CONTEXT_PATH}
 EXPOSE ${SERVER_PORT}
diff --git a/basyx.submodelregistry/basyx.submodelregistry-service-release-kafka-mongodb/src/main/docker/Dockerfile b/basyx.submodelregistry/basyx.submodelregistry-service-release-kafka-mongodb/src/main/docker/Dockerfile
index 65024b26e..47ae34ae9 100644
--- a/basyx.submodelregistry/basyx.submodelregistry-service-release-kafka-mongodb/src/main/docker/Dockerfile
+++ b/basyx.submodelregistry/basyx.submodelregistry-service-release-kafka-mongodb/src/main/docker/Dockerfile
@@ -11,8 +11,6 @@ RUN true
 COPY --from=builder spring-boot-loader/ ./
 COPY --from=builder application/ ./
 ENV SPRING_PROFILES_ACTIVE=kafkaEvents,mongoDbStorage
-ARG PORT=8080
-ENV SERVER_PORT=${PORT}
 ARG CONTEXT_PATH=/
 ENV SERVER_SERVLET_CONTEXT_PATH=${CONTEXT_PATH}
 EXPOSE ${SERVER_PORT}
diff --git a/basyx.submodelregistry/basyx.submodelregistry-service-release-log-mem/src/main/docker/Dockerfile b/basyx.submodelregistry/basyx.submodelregistry-service-release-log-mem/src/main/docker/Dockerfile
index 57ae2024c..12ff102f0 100644
--- a/basyx.submodelregistry/basyx.submodelregistry-service-release-log-mem/src/main/docker/Dockerfile
+++ b/basyx.submodelregistry/basyx.submodelregistry-service-release-log-mem/src/main/docker/Dockerfile
@@ -11,8 +11,6 @@ RUN true
 COPY --from=builder spring-boot-loader/ ./
 COPY --from=builder application/ ./
 ENV SPRING_PROFILES_ACTIVE=logEvents,inMemoryStorage
-ARG PORT=8080
-ENV SERVER_PORT=${PORT}
 ARG CONTEXT_PATH=/
 ENV SERVER_SERVLET_CONTEXT_PATH=${CONTEXT_PATH}
 EXPOSE ${SERVER_PORT}
diff --git a/basyx.submodelregistry/basyx.submodelregistry-service-release-log-mongodb/src/main/docker/Dockerfile b/basyx.submodelregistry/basyx.submodelregistry-service-release-log-mongodb/src/main/docker/Dockerfile
index 69f0bb66d..3f541de3e 100644
--- a/basyx.submodelregistry/basyx.submodelregistry-service-release-log-mongodb/src/main/docker/Dockerfile
+++ b/basyx.submodelregistry/basyx.submodelregistry-service-release-log-mongodb/src/main/docker/Dockerfile
@@ -11,8 +11,6 @@ RUN true
 COPY --from=builder spring-boot-loader/ ./
 COPY --from=builder application/ ./
 ENV SPRING_PROFILES_ACTIVE=logEvents,mongoDbStorage
-ARG PORT=8080
-ENV SERVER_PORT=${PORT}
 ARG CONTEXT_PATH=/
 ENV SERVER_SERVLET_CONTEXT_PATH=${CONTEXT_PATH}
 EXPOSE ${SERVER_PORT}
diff --git a/basyx.submodelrepository/basyx.submodelrepository.component/Dockerfile b/basyx.submodelrepository/basyx.submodelrepository.component/Dockerfile
index 1c3e9648d..2af59d73c 100644
--- a/basyx.submodelrepository/basyx.submodelrepository.component/Dockerfile
+++ b/basyx.submodelrepository/basyx.submodelrepository.component/Dockerfile
@@ -4,8 +4,6 @@ WORKDIR /application
 ARG JAR_FILE=target/*-exec.jar
 COPY ${JAR_FILE} basyxExecutable.jar
 COPY src/main/resources/application.properties application.properties
-ARG PORT=8081
-ENV SERVER_PORT=${PORT}
 EXPOSE ${SERVER_PORT}
 HEALTHCHECK --interval=30s --timeout=3s --retries=3 --start-period=15s CMD curl --fail http://localhost:${SERVER_PORT}/actuator/health || exit 1
 ENTRYPOINT ["java","-jar","basyxExecutable.jar"]