diff --git a/salt/mysql/init.sls b/salt/mysql/init.sls
index ba78476dc..c077695b8 100644
--- a/salt/mysql/init.sls
+++ b/salt/mysql/init.sls
@@ -87,6 +87,8 @@ so-mysql:
     - networks:
       - sobridge:
         - ipv4_address: {{ DOCKER.containers['so-mysql'].ip }}
+    - extra_hosts:
+      - {{ GLOBALS.manager }}:{{ GLOBALS.manager_ip }}
     - port_bindings:
       {% for BINDING in DOCKER.containers['so-mysql'].port_bindings %}
       - {{ BINDING }}
@@ -105,7 +107,7 @@ so-mysql:
       - file: mysqlcnf
       - file: mysqlpass
   cmd.run:
-    - name: until nc -z {{ GLOBALS.so_docker_bip }} 3306; do sleep 1; done
+    - name: until nc -z {{ GLOBALS.manager }} 3306; do sleep 1; done
     - timeout: 600
     - onchanges:
       - docker_container: so-mysql
diff --git a/salt/playbook/init.sls b/salt/playbook/init.sls
index 8afd3d70b..5fe9ab92f 100644
--- a/salt/playbook/init.sls
+++ b/salt/playbook/init.sls
@@ -85,8 +85,10 @@ so-playbook:
         - ipv4_address: {{ DOCKER.containers['so-playbook'].ip }}
     - binds:
       - /opt/so/log/playbook:/playbook/log:rw
+    - extra_hosts:
+      - {{ GLOBALS.manager }}:{{ GLOBALS.manager_ip }}
     - environment:
-      - REDMINE_DB_MYSQL={{ DOCKER.containers['so-mysql'].ip }}
+      - REDMINE_DB_MYSQL={{ GLOBALS.manager }}
       - REDMINE_DB_DATABASE=playbook
       - REDMINE_DB_USERNAME=playbookdbuser
       - REDMINE_DB_PASSWORD={{ PLAYBOOKPASS }}