diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f420c8a..26c1a0b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## v0.4.47
 
+CHANGE: the Docker instance will wait for the ziti container healthy status (contribution from Ben Wong @bwong365 - https://github.com/openziti/zrok/pull/790)
+
 CHANGE: Document solving the DNS propagation timeout for Docker instances that are using Caddy to manage the wildcard certificate.
 
 CHANGE: Add usage hint in `zrok config get --help` to clarify how to list all valid `configName` and their current values by running `zrok status`.
diff --git a/docker/compose/zrok-instance/compose.yml b/docker/compose/zrok-instance/compose.yml
index 80b9b143..4b553d63 100644
--- a/docker/compose/zrok-instance/compose.yml
+++ b/docker/compose/zrok-instance/compose.yml
@@ -87,6 +87,8 @@ services:
     depends_on:
         zrok-permissions:
           condition: service_completed_successfully
+        ziti-quickstart:
+          condition: service_healthy
     build:
       context: .
       dockerfile: ./zrok-controller.Dockerfile
@@ -121,6 +123,8 @@ services:
     depends_on:
         zrok-permissions:
           condition: service_completed_successfully
+        ziti-quickstart:
+          condition: service_healthy
     build:
       context: .
       dockerfile: zrok-frontend.Dockerfile