diff --git a/docker/docker-files/Dockerfile b/docker/docker-files/Dockerfile
index 1e962ba..b0c6989 100644
--- a/docker/docker-files/Dockerfile
+++ b/docker/docker-files/Dockerfile
@@ -17,7 +17,7 @@ RUN mvn install \
 ###################
 # PACKAGING STAGE #
 ###################
-FROM gisaia/arlas-openjdk:17-distroless
+FROM gisaia/arlas-openjdk-17-distroless:20240325094836
 
 # application placed into /opt/app
 WORKDIR /opt/app
@@ -26,8 +26,5 @@ COPY --from=build /opt/build/conf/configuration.yaml /opt/app/
 COPY --from=build /opt/build/docker/docker-files/pgCreateTable.sql /opt/app/
 EXPOSE 9997
 
-HEALTHCHECK --interval=5m --timeout=3s \
-  CMD curl http://localhost:9997/admin/healthcheck | grep -v "\"healthy\":false" || exit 1
-
 ENV JDK_JAVA_OPTIONS="-Xmx512m -XX:+ExitOnOutOfMemoryError"
 CMD ["arlas-persistence-server.jar", "server", "/opt/app/configuration.yaml"]
diff --git a/docker/docker-files/Dockerfile-package-only b/docker/docker-files/Dockerfile-package-only
index de29004..0d0a683 100644
--- a/docker/docker-files/Dockerfile-package-only
+++ b/docker/docker-files/Dockerfile-package-only
@@ -1,7 +1,7 @@
 ###################
 # PACKAGING STAGE #
 ###################
-FROM gisaia/arlas-openjdk:17-distroless
+FROM gisaia/arlas-openjdk-17-distroless:20240325094836
 
 # application placed into /opt/app
 WORKDIR /opt/app
@@ -10,8 +10,5 @@ ADD conf/configuration.yaml /opt/app/configuration.yaml
 ADD docker/docker-files/pgCreateTable.sql /opt/app/pgCreateTable.sql
 EXPOSE 9997
 
-HEALTHCHECK --interval=5m --timeout=3s \
-  CMD curl http://localhost:9997/admin/healthcheck | grep -v "\"healthy\":false" || exit 1
-
 ENV JDK_JAVA_OPTIONS="-Xmx512m -XX:+ExitOnOutOfMemoryError"
 CMD ["arlas-persistence-server.jar", "server", "/opt/app/configuration.yaml"]
diff --git a/docker/docker-files/docker-compose.yml b/docker/docker-files/docker-compose.yml
index c0f79d7..a56a342 100644
--- a/docker/docker-files/docker-compose.yml
+++ b/docker/docker-files/docker-compose.yml
@@ -48,3 +48,8 @@ services:
     volumes:
       - ${GOOGLE_APPLICATION_CREDENTIALS:-/tmp}:/opt/app/google-registry.json:ro
       - ${ARLAS_PERSISTENCE_LOCAL_FOLDER_HOST:-/tmp/persist/}:${ARLAS_PERSISTENCE_LOCAL_FOLDER:-/tmp/persist/}:rw
+    healthcheck:
+      test: ["CMD","java","HttpHealthcheck.java","http://localhost:9997/admin/healthcheck"]
+      interval: 5s
+      timeout: 10s
+      retries: 3