diff --git a/docker/dockerfiles/joex.dockerfile b/docker/dockerfiles/joex.dockerfile
index a75de16c..3fdebd6f 100644
--- a/docker/dockerfiles/joex.dockerfile
+++ b/docker/dockerfiles/joex.dockerfile
@@ -68,5 +68,5 @@ COPY joex-entrypoint.sh /opt/joex-entrypoint.sh
 ENTRYPOINT ["/opt/joex-entrypoint.sh", "-J-XX:+UseG1GC"]
 EXPOSE 7878
 
-HEALTHCHECK --interval=1m --timeout=10s --retries=2 --start-period=10s \
-  CMD pgrep -f joex/lib
+HEALTHCHECK --interval=1m --timeout=10s --retries=2 --start-period=30s \
+  CMD wget --spider http://localhost:7878/api/info/version
diff --git a/docker/dockerfiles/restserver.dockerfile b/docker/dockerfiles/restserver.dockerfile
index 870fb349..aa39cfe8 100644
--- a/docker/dockerfiles/restserver.dockerfile
+++ b/docker/dockerfiles/restserver.dockerfile
@@ -18,4 +18,4 @@ ENTRYPOINT ["/opt/docspell-restserver/bin/docspell-restserver", "-J-XX:+UseG1GC"
 EXPOSE 7880
 
 HEALTHCHECK --interval=1m --timeout=10s --retries=2 --start-period=30s \
-  CMD wget --spider http://localhost:7880
+  CMD wget --spider http://localhost:7880/api/info/version