diff --git a/src/main/java/net/siegeln/cameleer/saas/identity/ServerApiClient.java b/src/main/java/net/siegeln/cameleer/saas/identity/ServerApiClient.java
index 1f77a62..4a86390 100644
--- a/src/main/java/net/siegeln/cameleer/saas/identity/ServerApiClient.java
+++ b/src/main/java/net/siegeln/cameleer/saas/identity/ServerApiClient.java
@@ -76,7 +76,7 @@ public class ServerApiClient {
     @SuppressWarnings("unchecked")
     public ServerHealthResponse getHealth(String serverEndpoint) {
         try {
-            String url = serverEndpoint + "/actuator/health";
+            String url = serverEndpoint + "/api/v1/health";
             var resp = RestClient.create().get().uri(url)
                 .header("Authorization", "Bearer " + getAccessToken())
                 .header("X-Cameleer-Protocol-Version", "1")
diff --git a/src/main/java/net/siegeln/cameleer/saas/provisioning/DockerTenantProvisioner.java b/src/main/java/net/siegeln/cameleer/saas/provisioning/DockerTenantProvisioner.java
index 35711c6..ee0852b 100644
--- a/src/main/java/net/siegeln/cameleer/saas/provisioning/DockerTenantProvisioner.java
+++ b/src/main/java/net/siegeln/cameleer/saas/provisioning/DockerTenantProvisioner.java
@@ -167,10 +167,11 @@ public class DockerTenantProvisioner implements TenantProvisioner {
             .withEnv(env)
             .withHostConfig(hostConfig)
             .withHealthcheck(new HealthCheck()
-                .withTest(List.of("CMD-SHELL", "wget -q -O- http://localhost:8081/actuator/health || exit 1"))
+                .withTest(List.of("CMD-SHELL", "curl -sf http://localhost:8081/api/v1/health || exit 1"))
                 .withInterval(5_000_000_000L)
-                .withTimeout(3_000_000_000L)
-                .withRetries(12))
+                .withTimeout(5_000_000_000L)
+                .withRetries(30)
+                .withStartPeriod(15_000_000_000L))
             .exec();
 
         // Connect to traefik network with DNS alias