diff --git a/Dockerfile b/Dockerfile
index 51908346d..a90c66124 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -40,5 +40,6 @@ RUN ./docker/finalize.sh
 # Configure Docker Container
 VOLUME ["/data", "/backup"]
 EXPOSE 22 3000
+HEALTHCHECK CMD (nc -z -w 3 localhost:22 && curl -o /dev/null -sS http://localhost:3000/healthcheck) || exit 1
 ENTRYPOINT ["/app/gogs/docker/start.sh"]
 CMD ["/bin/s6-svscan", "/app/gogs/docker/s6/"]
diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64
index d69916899..444bbb41a 100644
--- a/docker/Dockerfile.aarch64
+++ b/docker/Dockerfile.aarch64
@@ -40,5 +40,6 @@ RUN ./docker/finalize.sh
 # Configure Docker Container
 VOLUME ["/data", "/backup"]
 EXPOSE 22 3000
+HEALTHCHECK CMD (nc -z -w 3 localhost:22 && curl -o /dev/null -sS http://localhost:3000/healthcheck) || exit 1
 ENTRYPOINT ["/app/gogs/docker/start.sh"]
 CMD ["/bin/s6-svscan", "/app/gogs/docker/s6/"]
diff --git a/docker/Dockerfile.rpi b/docker/Dockerfile.rpi
index 8e0b41f43..96abde271 100644
--- a/docker/Dockerfile.rpi
+++ b/docker/Dockerfile.rpi
@@ -40,5 +40,6 @@ RUN ./docker/finalize.sh
 # Configure Docker Container
 VOLUME ["/data", "/backup"]
 EXPOSE 22 3000
+HEALTHCHECK CMD (nc -z -w 3 localhost:22 && curl -o /dev/null -sS http://localhost:3000/healthcheck) || exit 1
 ENTRYPOINT ["/app/gogs/docker/start.sh"]
 CMD ["/bin/s6-svscan", "/app/gogs/docker/s6/"]