diff --git a/build/Dockerfile b/build/Dockerfile
index e90ff25..696e476 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -17,6 +17,10 @@ LABEL maintainer="Simon Felding <sife@adm.ku.dk>"
 EXPOSE 25/tcp
 EXPOSE 143/tcp
 
+# Add healthcheck to monitor proton-bridge process
+HEALTHCHECK --interval=30s --timeout=10s --retries=3 --start-period=60s \
+  CMD bash -c "pgrep -f proton-bridge || exit 1"
+
 # Install dependencies and protonmail bridge
 RUN apt-get update \
     && apt-get install -y --no-install-recommends socat pass libsecret-1-0 ca-certificates \