diff --git a/docker-compose.yml b/docker-compose.yml
index 01cf87ed..32a8cc68 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -97,12 +97,6 @@ services:
       - ${MEMOH_CONFIG:-./docker/config/config.docker.toml}:/config.toml:ro
     ports:
       - "8081:8081"
-    healthcheck:
-      test: ["CMD-SHELL", "wget --no-verbose --tries=1 --spider http://127.0.0.1:8081/health || exit 1"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-      start_period: 20s
     depends_on:
       - server
     restart: unless-stopped
diff --git a/docker/Dockerfile.agent b/docker/Dockerfile.agent
index f90d64de..4c885c44 100644
--- a/docker/Dockerfile.agent
+++ b/docker/Dockerfile.agent
@@ -31,6 +31,8 @@ COPY --from=builder /build/node_modules /node_modules
 EXPOSE 8081
 
 HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
-    CMD wget --no-verbose --tries=1 --spider http://localhost:8081/health || exit 1
+    CMD wget --no-verbose --tries=1 --spider http://127.0.0.1:8081/health \
+      || wget --no-verbose --tries=1 --spider http://agent:8081/health \
+      || exit 1
 
 CMD ["bun", "run", "dist/index.js"]
diff --git a/docker/Dockerfile.server b/docker/Dockerfile.server
index 7a164593..c3c166b9 100644
--- a/docker/Dockerfile.server
+++ b/docker/Dockerfile.server
@@ -70,6 +70,8 @@ RUN mkdir -p /opt/memoh/data
 EXPOSE 8080
 
 HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
-    CMD wget --no-verbose --tries=1 --spider http://localhost:8080/health || exit 1
+    CMD wget --no-verbose --tries=1 --spider http://127.0.0.1:8080/health \
+      || wget --no-verbose --tries=1 --spider http://server:8080/health \
+      || exit 1
 
 CMD ["/app/memoh-server"]