diff --git a/Dockerfile b/Dockerfile
index 638c524..646bd78 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,5 +14,8 @@ FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS runtime
 WORKDIR /app
 COPY --from=build /app/CleanArchitecture.Api/out ./
 
+HEALTHCHECK --interval=30s --timeout=5s --start-period=5s --retries=3 \
+  CMD curl --fail http://localhost/healthz || exit 1
+
 EXPOSE 80
 ENTRYPOINT ["dotnet", "CleanArchitecture.Api.dll"]
diff --git a/docker-compose.yml b/docker-compose.yml
index f1b1c2c..2eca5e4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,10 +10,15 @@ services:
       - db
     links:
       - db
+    healthcheck:
+      test: ["CMD", "curl", "--fail", "http://localhost/healthz"]
+      interval: 30s
+      timeout: 5s
+      retries: 3
   db:
     image: mcr.microsoft.com/mssql/server
     environment:
       - ACCEPT_EULA=Y
-      - SA_PASSWORD=YourStrongPassword
+      - SA_PASSWORD=Password123!#
     ports:
       - 1433:1433