diff --git a/auth/Dockerfile b/auth/Dockerfile
index 5295e0c2..7c587b72 100644
--- a/auth/Dockerfile
+++ b/auth/Dockerfile
@@ -23,4 +23,5 @@ USER nonroot:nonroot
 COPY --from=build /keibi /app/keibi
 COPY sql ./sql
 
+HEALTHCHECK --interval=5s --retries=15 CMD curl --fail http://localhost:4568$KEIBI_PREFIX/health || exit
 CMD ["/app/keibi"]
diff --git a/auth/Dockerfile.dev b/auth/Dockerfile.dev
index 9519eac5..82b53242 100644
--- a/auth/Dockerfile.dev
+++ b/auth/Dockerfile.dev
@@ -7,4 +7,5 @@ COPY go.mod go.sum ./
 RUN go mod download
 
 EXPOSE 4568
+HEALTHCHECK --interval=5s --retries=15 CMD curl --fail http://localhost:4568$KEIBI_PREFIX/health || exit
 CMD ["wgo", "run", "-race", "."]
diff --git a/docker-compose.dev-v5.yml b/docker-compose.dev-v5.yml
index b0ab5a6c..8f527832 100644
--- a/docker-compose.dev-v5.yml
+++ b/docker-compose.dev-v5.yml
@@ -70,6 +70,8 @@ services:
     depends_on:
       postgres:
         condition: service_healthy
+      auth:
+        condition: service_healthy
     volumes:
       - ./api:/app
       - /app/node_modules