diff --git a/goofy-client/.editorconfig b/goofy-client/.editorconfig
index c459c0b1dd5bf84ef20cab1ec44f9395634c5130..e14b6a99e7209e7a792eb54731d0a73614ce9d7c 100644
--- a/goofy-client/.editorconfig
+++ b/goofy-client/.editorconfig
@@ -33,4 +33,7 @@ indent_size = 4
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
-insert_final_newline = false
\ No newline at end of file
+insert_final_newline = false
+
+[*.yml]
+indent_size = 2
\ No newline at end of file
diff --git a/goofy-client/apps/goofy-e2e/docker-compose.yml b/goofy-client/apps/goofy-e2e/docker-compose.yml
index 58970813c6d2b2952c40f08a1cdb47059396e048..d0977909fcad8e51c575b1fe8ab5001662e88f38 100644
--- a/goofy-client/apps/goofy-e2e/docker-compose.yml
+++ b/goofy-client/apps/goofy-e2e/docker-compose.yml
@@ -46,8 +46,10 @@ services:
     ports:
       - 9091:9090
     depends_on:
-      - ozg-mongodb
-      - ozg-elastic
+      ozg-mongodb:
+        condition: service_started
+      ozg-elastic:
+        condition: service_healthy
 
   ozg-goofy:
     image: docker.ozg-sh.de/goofy:${GOOFY_DOCKER_IMAGE:-snapshot-latest}
@@ -85,6 +87,11 @@ services:
       nofile:
         soft: 65536
         hard: 65536
+    healthcheck:
+      test: [ "CMD", "curl", "-f", "http://localhost:9200" ]
+      timeout: 10s
+      retries: 5
+      start_period: 30s
 
   ozg-usermanager:
     image: docker.ozg-sh.de/user-manager:${USERMANAGER_DOCKER_IMAGE:-snapshot-latest}