diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index d1d6fd6..ea0a840 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -41,6 +41,12 @@ services:
     container_name: occto_frontend_dev
     expose:
       - "3000"
+    healthcheck:
+      test: ["CMD", "wget", "-q", "--spider", "http://localhost:3000/api/health"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 30s
     environment:
       - NODE_ENV=production
       - DATABASE_URL=postgresql://admin:adminpassword@postgres_dev:5432/occto_db_dev?schema=public
diff --git a/frontend/src/app/api/health/route.ts b/frontend/src/app/api/health/route.ts
new file mode 100644
index 0000000..3ec01eb
--- /dev/null
+++ b/frontend/src/app/api/health/route.ts
@@ -0,0 +1,5 @@
+import { NextResponse } from 'next/server';
+
+export async function GET() {
+  return NextResponse.json({ status: 'ok', timestamp: new Date().toISOString() });
+}