diff --git a/.husky/pre-commit b/.husky/pre-commit
index 93e4383..ad68317 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -2,4 +2,4 @@
 export BUN_INSTALL="$HOME/.bun"
 export PATH="$BUN_INSTALL/bin:$PATH"
 
-bun lint-staged
+bun lint-staged 2>/dev/null || npx lint-staged
diff --git a/docker-compose.aggregator.yml b/docker-compose.aggregator.yml
index 31a10c4..d28b231 100644
--- a/docker-compose.aggregator.yml
+++ b/docker-compose.aggregator.yml
@@ -9,6 +9,12 @@ services:
       dockerfile: Dockerfile.aggregator
     container_name: backlog-aggregator
     restart: unless-stopped
+    healthcheck:
+      test: ["CMD", "bun", "-e", "fetch('http://127.0.0.1:6420/').then(r => process.exit(r.ok ? 0 : 1)).catch(() => process.exit(1))"]
+      interval: 30s
+      timeout: 10s
+      start_period: 60s
+      retries: 3
     volumes:
       # Mount all project directories that contain backlog folders
       - /opt/websites:/projects/websites:rw