diff --git a/Dockerfile b/Dockerfile
index 10ecdf3fb2..57ef063995 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -33,8 +33,8 @@ EXPOSE 3080
 ENV HOST=0.0.0.0
 
 # Define a health check
-HEALTHCHECK --interval=30s --timeout=10s --start-period=10s --retries=5 \
-  CMD curl -f http://localhost:3080/health || exit 1
+HEALTHCHECK --interval=10s --timeout=5s --start-period=30s --retries=3 \
+  CMD curl -f http://localhost:3080/health
 
 # Start the backend service
 CMD ["npm", "run", "backend"]
diff --git a/docker-compose.yml b/docker-compose.yml
index 569e5dc42c..8010ed7ca9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -27,6 +27,12 @@ services:
       - ./images:/app/client/public/images
       - ./uploads:/app/uploads
       - ./logs:/app/api/logs
+    healthcheck:
+      test: [ "CMD", "curl", "-f", "http://api:${PORT}/health" ]
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 30s
 
   mongodb:
     container_name: chat-mongodb