diff --git a/basyx.aasenvironment/basyx.aasenvironment.component/Dockerfile b/basyx.aasenvironment/basyx.aasenvironment.component/Dockerfile
index 6273bf177..ee4535a3c 100644
--- a/basyx.aasenvironment/basyx.aasenvironment.component/Dockerfile
+++ b/basyx.aasenvironment/basyx.aasenvironment.component/Dockerfile
@@ -6,4 +6,5 @@ COPY ${JAR_FILE} basyxExecutable.jar
 COPY src/main/resources/application.properties application.properties
 ARG PORT=8081
 EXPOSE ${PORT}
+HEALTHCHECK --interval=30s --timeout=12s --start-period=30s CMD curl --fail http://localhost:8081/shells || exit 1
 ENTRYPOINT ["java","-jar","basyxExecutable.jar"]
\ No newline at end of file
diff --git a/basyx.aasrepository/basyx.aasrepository.component/Dockerfile b/basyx.aasrepository/basyx.aasrepository.component/Dockerfile
index 6f239ba9b..6e2fe1b03 100644
--- a/basyx.aasrepository/basyx.aasrepository.component/Dockerfile
+++ b/basyx.aasrepository/basyx.aasrepository.component/Dockerfile
@@ -6,4 +6,5 @@ COPY ${JAR_FILE} basyxExecutable.jar
 COPY src/main/resources/application.properties application.properties
 ARG PORT=8081
 EXPOSE ${PORT}
+HEALTHCHECK --interval=30s --timeout=12s --start-period=30s CMD curl --fail http://localhost:8081/shells || exit 1
 ENTRYPOINT ["java","-jar","basyxExecutable.jar"]
diff --git a/basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository.component/Dockerfile b/basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository.component/Dockerfile
index 6f239ba9b..641d2d753 100644
--- a/basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository.component/Dockerfile
+++ b/basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository.component/Dockerfile
@@ -6,4 +6,5 @@ COPY ${JAR_FILE} basyxExecutable.jar
 COPY src/main/resources/application.properties application.properties
 ARG PORT=8081
 EXPOSE ${PORT}
+HEALTHCHECK --interval=30s --timeout=12s --start-period=30s CMD curl --fail http://localhost:8081/submodels || exit 1
 ENTRYPOINT ["java","-jar","basyxExecutable.jar"]
diff --git a/basyx.submodelrepository/basyx.submodelrepository.component/Dockerfile b/basyx.submodelrepository/basyx.submodelrepository.component/Dockerfile
index 6f239ba9b..65369658d 100644
--- a/basyx.submodelrepository/basyx.submodelrepository.component/Dockerfile
+++ b/basyx.submodelrepository/basyx.submodelrepository.component/Dockerfile
@@ -6,4 +6,5 @@ COPY ${JAR_FILE} basyxExecutable.jar
 COPY src/main/resources/application.properties application.properties
 ARG PORT=8081
 EXPOSE ${PORT}
+HEALTHCHECK --interval=30s --timeout=12s --start-period=30s CMD curl --fail http://localhost:8081/concept-descriptions || exit 1
 ENTRYPOINT ["java","-jar","basyxExecutable.jar"]