diff --git a/Dockerfile.release b/Dockerfile.release
index 52ef4d803..ca05f171a 100644
--- a/Dockerfile.release
+++ b/Dockerfile.release
@@ -22,5 +22,7 @@ RUN rm -rf /var/lib/zerotier-one
 COPY entrypoint.sh.release /entrypoint.sh
 RUN chmod 755 /entrypoint.sh
 
+HEALTHCHECK CMD bash /healthcheck.sh
+
 CMD []
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/entrypoint.sh.release b/entrypoint.sh.release
index dbbd3683f..853eb9ad7 100644
--- a/entrypoint.sh.release
+++ b/entrypoint.sh.release
@@ -65,15 +65,16 @@ do
   sleep 1
 done
 
-echo "Ensuring status for networks: $@"
+echo "Writing healthcheck for networks: $@"
 
-for i in "$@"
+cat >/healthcheck.sh <<EOF
+#!/bin/bash
+for i in $@
 do
-  while [ "$(zerotier-cli get $i status)" != "OK" ]
-  do 
-    echo "joining $i failed (are they added in central?); trying again in 1s"
-    sleep 1
-  done
+  [ "\$(zerotier-cli get \$i status)" = "OK" ] || exit 1
 done
+EOF
+
+chmod +x /healthcheck.sh
 
 sleep infinity