diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
index cf02175..fd84dc8 100644
--- a/.github/workflows/playwright.yml
+++ b/.github/workflows/playwright.yml
@@ -20,19 +20,24 @@ jobs:
           POSTGRES_PASSWORD: secret
         ports:
           - "5432:5432"
+        healthcheck:
+          test: ["CMD-SHELL", "pg_isready -U employee"]
+          interval: 10s
+          timeout: 5s
+          retries: 5
 
       employee:
         container_name: employee
         image: berndheidemann/employee-management-service:1.1.3
-        # image: berndheidemann/employee-management-service_without_keycloak:1.1
         env:
-          spring.datasource.url: jdbc:postgresql://postgres-employee:5432/employee_db
-          spring.datasource.username: employee
-          spring.datasource.password: secret
+          SPRING_DATASOURCE_URL: jdbc:postgresql://postgres-employee:5432/employee_db
+          SPRING_DATASOURCE_USERNAME: employee
+          SPRING_DATASOURCE_PASSWORD: secret
         ports:
           - "8089:8089"
         depends_on:
-          - postgres-employee
+          postgres-employee:
+            condition: service_healthy
 
     steps:
       # Checkout the repository