diff --git a/Dockerfile b/Dockerfile
index 1349d6e..418446c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,4 +35,7 @@ USER svelte
 EXPOSE 3001
 ENV PORT=3001
 
+HEALTHCHECK --interval=5s --timeout=3s --start-period=15s --retries=3 \
+  CMD wget -qO- http://localhost:3001/ > /dev/null || exit 1
+
 CMD ["node", "build"]
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 19414aa..18d97ee 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -10,6 +10,7 @@ services:
       - image-cache:/data/image-cache
     networks:
       - web
+    stop_grace_period: 30s
 
 volumes:
   image-cache: