diff --git a/basyx.aasdiscoveryservice/basyx.aasdiscoveryservice.component/Dockerfile b/basyx.aasdiscoveryservice/basyx.aasdiscoveryservice.component/Dockerfile
index 1c3e9648d..ce67dd54f 100644
--- a/basyx.aasdiscoveryservice/basyx.aasdiscoveryservice.component/Dockerfile
+++ b/basyx.aasdiscoveryservice/basyx.aasdiscoveryservice.component/Dockerfile
@@ -1,4 +1,4 @@
-FROM amazoncorretto:17
+FROM eclipse-temurin:17
 USER nobody
 WORKDIR /application
 ARG JAR_FILE=target/*-exec.jar
diff --git a/basyx.aasenvironment/basyx.aasenvironment.component/Dockerfile b/basyx.aasenvironment/basyx.aasenvironment.component/Dockerfile
index 1c3e9648d..ce67dd54f 100644
--- a/basyx.aasenvironment/basyx.aasenvironment.component/Dockerfile
+++ b/basyx.aasenvironment/basyx.aasenvironment.component/Dockerfile
@@ -1,4 +1,4 @@
-FROM amazoncorretto:17
+FROM eclipse-temurin:17
 USER nobody
 WORKDIR /application
 ARG JAR_FILE=target/*-exec.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 324d4fc49..bbddc1da9 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
@@ -1,8 +1,8 @@
-FROM amazoncorretto:17 as builder
+FROM eclipse-temurin:17 as builder
 COPY maven/${project.build.finalName}.jar ./
 RUN java -Djarmode=layertools -jar ${project.build.finalName}.jar extract
 
-FROM amazoncorretto:17
+FROM eclipse-temurin:17
 RUN mkdir /workspace
 WORKDIR /workspace
 COPY --from=builder dependencies/ ./
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 b064339b7..7e157b1ca 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
@@ -1,8 +1,8 @@
-FROM amazoncorretto:17 as builder
+FROM eclipse-temurin:17 as builder
 COPY maven/${project.build.finalName}.jar ./
 RUN java -Djarmode=layertools -jar ${project.build.finalName}.jar extract
 
-FROM amazoncorretto:17
+FROM eclipse-temurin:17
 RUN mkdir /workspace
 WORKDIR /workspace
 COPY --from=builder dependencies/ ./
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 cba9fc132..d2f36e7ad 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
@@ -1,8 +1,8 @@
-FROM amazoncorretto:17 as builder
+FROM eclipse-temurin:17 as builder
 COPY maven/${project.build.finalName}.jar ./
 RUN java -Djarmode=layertools -jar ${project.build.finalName}.jar extract
 
-FROM amazoncorretto:17
+FROM eclipse-temurin:17
 RUN mkdir /workspace
 WORKDIR /workspace
 COPY --from=builder dependencies/ ./
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 807bbd7ca..3acf47076 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
@@ -1,8 +1,8 @@
-FROM amazoncorretto:17 as builder
+FROM eclipse-temurin:17 as builder
 COPY maven/${project.build.finalName}.jar ./
 RUN java -Djarmode=layertools -jar ${project.build.finalName}.jar extract
 
-FROM amazoncorretto:17
+FROM eclipse-temurin:17
 RUN mkdir /workspace
 WORKDIR /workspace
 COPY --from=builder dependencies/ ./
diff --git a/basyx.aasrepository/basyx.aasrepository.component/Dockerfile b/basyx.aasrepository/basyx.aasrepository.component/Dockerfile
index 1c3e9648d..ce67dd54f 100644
--- a/basyx.aasrepository/basyx.aasrepository.component/Dockerfile
+++ b/basyx.aasrepository/basyx.aasrepository.component/Dockerfile
@@ -1,4 +1,4 @@
-FROM amazoncorretto:17
+FROM eclipse-temurin:17
 USER nobody
 WORKDIR /application
 ARG JAR_FILE=target/*-exec.jar
diff --git a/basyx.aasxfileserver/basyx.aasxfileserver.component/Dockerfile b/basyx.aasxfileserver/basyx.aasxfileserver.component/Dockerfile
index 1c3e9648d..ce67dd54f 100644
--- a/basyx.aasxfileserver/basyx.aasxfileserver.component/Dockerfile
+++ b/basyx.aasxfileserver/basyx.aasxfileserver.component/Dockerfile
@@ -1,4 +1,4 @@
-FROM amazoncorretto:17
+FROM eclipse-temurin:17
 USER nobody
 WORKDIR /application
 ARG JAR_FILE=target/*-exec.jar
diff --git a/basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository.component/Dockerfile b/basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository.component/Dockerfile
index 850188a4c..f79271fc5 100644
--- a/basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository.component/Dockerfile
+++ b/basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository.component/Dockerfile
@@ -1,4 +1,4 @@
-FROM amazoncorretto:17
+FROM eclipse-temurin:17
 USER nobody
 WORKDIR /application
 ARG JAR_FILE=target/*-exec.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 324d4fc49..bbddc1da9 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
@@ -1,8 +1,8 @@
-FROM amazoncorretto:17 as builder
+FROM eclipse-temurin:17 as builder
 COPY maven/${project.build.finalName}.jar ./
 RUN java -Djarmode=layertools -jar ${project.build.finalName}.jar extract
 
-FROM amazoncorretto:17
+FROM eclipse-temurin:17
 RUN mkdir /workspace
 WORKDIR /workspace
 COPY --from=builder dependencies/ ./
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 b064339b7..7e157b1ca 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
@@ -1,8 +1,8 @@
-FROM amazoncorretto:17 as builder
+FROM eclipse-temurin:17 as builder
 COPY maven/${project.build.finalName}.jar ./
 RUN java -Djarmode=layertools -jar ${project.build.finalName}.jar extract
 
-FROM amazoncorretto:17
+FROM eclipse-temurin:17
 RUN mkdir /workspace
 WORKDIR /workspace
 COPY --from=builder dependencies/ ./
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 cba9fc132..d2f36e7ad 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
@@ -1,8 +1,8 @@
-FROM amazoncorretto:17 as builder
+FROM eclipse-temurin:17 as builder
 COPY maven/${project.build.finalName}.jar ./
 RUN java -Djarmode=layertools -jar ${project.build.finalName}.jar extract
 
-FROM amazoncorretto:17
+FROM eclipse-temurin:17
 RUN mkdir /workspace
 WORKDIR /workspace
 COPY --from=builder dependencies/ ./
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 807bbd7ca..3acf47076 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
@@ -1,8 +1,8 @@
-FROM amazoncorretto:17 as builder
+FROM eclipse-temurin:17 as builder
 COPY maven/${project.build.finalName}.jar ./
 RUN java -Djarmode=layertools -jar ${project.build.finalName}.jar extract
 
-FROM amazoncorretto:17
+FROM eclipse-temurin:17
 RUN mkdir /workspace
 WORKDIR /workspace
 COPY --from=builder dependencies/ ./
diff --git a/basyx.submodelrepository/basyx.submodelrepository.component/Dockerfile b/basyx.submodelrepository/basyx.submodelrepository.component/Dockerfile
index 1c3e9648d..ce67dd54f 100644
--- a/basyx.submodelrepository/basyx.submodelrepository.component/Dockerfile
+++ b/basyx.submodelrepository/basyx.submodelrepository.component/Dockerfile
@@ -1,4 +1,4 @@
-FROM amazoncorretto:17
+FROM eclipse-temurin:17
 USER nobody
 WORKDIR /application
 ARG JAR_FILE=target/*-exec.jar
diff --git a/basyx.submodelservice/basyx.submodelservice.example/Dockerfile b/basyx.submodelservice/basyx.submodelservice.example/Dockerfile
index 1c3e9648d..ce67dd54f 100644
--- a/basyx.submodelservice/basyx.submodelservice.example/Dockerfile
+++ b/basyx.submodelservice/basyx.submodelservice.example/Dockerfile
@@ -1,4 +1,4 @@
-FROM amazoncorretto:17
+FROM eclipse-temurin:17
 USER nobody
 WORKDIR /application
 ARG JAR_FILE=target/*-exec.jar
diff --git a/pom.xml b/pom.xml
index 2b804961f..84438d7c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@
 		<docker.namespace>eclipsebasyx</docker.namespace>
 		<docker.image.name>NOT_DEFINED_IN_MODULE</docker.image.name>
 		<docker.image.tag>${revision}</docker.image.tag>
-		<docker.target.platforms>linux/amd64, linux/arm64</docker.target.platforms>
+		<docker.target.platforms>linux/amd64, linux/arm64, linux/arm/v7</docker.target.platforms>
 		<docker.host.port>8081</docker.host.port>
 		<docker.container.port>8081</docker.container.port>
 		<aas4j-version>1.0.2</aas4j-version>