diff --git a/services/backend/Dockerfile.staticfiles b/services/backend/Dockerfile.staticfiles
index f43a0d7..11d6378 100644
--- a/services/backend/Dockerfile.staticfiles
+++ b/services/backend/Dockerfile.staticfiles
@@ -26,4 +26,7 @@ COPY --from=builder /app/static /usr/share/nginx/html
 
 COPY ../checker/checker_requirements.txt /usr/share/nginx/html
 
-CMD ["nginx", "-g", "daemon off;"]
+HEALTHCHECK --interval=30s --timeout=5s --start-period=5s --start-interval=2s --retries=3 \
+    CMD wget --no-verbose --tries=1 --spider http://127.0.0.1:80/ || exit 1
+
+CMD [ "nginx", "-g", "daemon off;" ]
diff --git a/services/frontend/Dockerfile b/services/frontend/Dockerfile
index 8f2350f..20d53f8 100644
--- a/services/frontend/Dockerfile
+++ b/services/frontend/Dockerfile
@@ -4,9 +4,11 @@ FROM oven/bun:latest AS builder
 WORKDIR /app
 
 COPY package.json bun.lock ./
+
 RUN bun install --frozen-lockfile
 
 COPY . .
+
 RUN bun run build
 
 # Stage 2: Serve the built files with Nginx
@@ -16,4 +18,7 @@ COPY --from=builder /app/dist /usr/share/nginx/html
 
 COPY ./nginx/nginx.conf /etc/nginx/nginx.conf
 
-CMD ["nginx", "-g", "daemon off;"]
+HEALTHCHECK --interval=30s --timeout=5s --start-period=5s --start-interval=2s --retries=3 \
+    CMD wget --no-verbose --tries=1 --spider http://127.0.0.1:80/ || exit 1
+
+CMD [ "nginx", "-g", "daemon off;" ]