diff --git a/salt/fleet/init.sls b/salt/fleet/init.sls
index 926666b32..5fadf8184 100644
--- a/salt/fleet/init.sls
+++ b/salt/fleet/init.sls
@@ -91,6 +91,7 @@ fleetdb:
     - connection_pass: {{ MYSQLPASS }}
     - require:
       - sls: mysql
+      - cmd: so-mysql
 
 fleetdbuser:
   mysql_user.present:
diff --git a/salt/mysql/init.sls b/salt/mysql/init.sls
index a8e47ca5b..7cce0fc69 100644
--- a/salt/mysql/init.sls
+++ b/salt/mysql/init.sls
@@ -57,7 +57,6 @@ mysqldatadir:
     - user: 939
     - group: 939
     - makedirs: True
-
 {% if MYSQLPASS == None %}
 
 mysql_password_none:
@@ -85,4 +84,9 @@ so-mysql:
       - /opt/so/log/mysql:/var/log/mysql:rw
     - watch:
       - /opt/so/conf/mysql/etc
+  cmd.run:
+    - name: until nc -z localhost 3036; do sleep 1; done
+    - timeout: 120
+    - onchanges:
+      - docker_container: so-mysql
 {% endif %}
\ No newline at end of file