diff --git a/galera/files/bootstrap.sh b/galera/files/bootstrap.sh
index b4a3122..92b1d05 100644
--- a/galera/files/bootstrap.sh
+++ b/galera/files/bootstrap.sh
@@ -1,13 +1,12 @@
-{%- from "galera/map.jinja" import slave with context -%}
 #!/bin/bash
 
-service {{ slave.service }} start
+service {{ service.service }} start
 
-counter=70
+counter=60
 
 while [ $counter -gt 0 ]
 do
-  service {{ slave.service }} status
+  mysql -h {{ service.bind.address }} -u {{ service.admin.user }} -p{{ service.admin.password }} -e"quit"
   if [[ $? -eq 0 ]]; then
     exit 0
   fi
diff --git a/galera/files/init_bootstrap.sh b/galera/files/init_bootstrap.sh
new file mode 100644
index 0000000..47c5bd2
--- /dev/null
+++ b/galera/files/init_bootstrap.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+service {{ service.service }} start
+
+counter=60
+
+while [ $counter -gt 0 ]
+do
+  mysql -h {{ service.bind.address }} -u root -e"quit"
+  if [[ $? -eq 0 ]]; then
+    exit 0
+  fi
+  counter=$(( $counter - 1 ))
+  sleep 2
+done
+
+exit 1
diff --git a/galera/master.sls b/galera/master.sls
index 58b0a89..eab92bf 100644
--- a/galera/master.sls
+++ b/galera/master.sls
@@ -62,21 +62,32 @@
 
 {%- endif %} 
 
+galera_init_script:
+  file.managed:
+  - name: /usr/local/sbin/galera_init.sh
+  - mode: 755
+  - source: salt://galera/files/init_bootstrap.sh
+  - defaults:
+      service: {{ master|yaml }}
+  - template: jinja
+
 galera_bootstrap_script:
   file.managed:
   - name: /usr/local/sbin/galera_bootstrap.sh
   - mode: 755
   - source: salt://galera/files/bootstrap.sh
+  - defaults:
+      service: {{ master|yaml }}
   - template: jinja
 
 {%- if salt['cmd.run']('test -e /var/lib/mysql/.galera_bootstrap; echo $?') != '0'  %}
 
-galera_bootstrap_start_service:
+galera_init_start_service:
   cmd.run:
-  - name: /usr/local/sbin/galera_bootstrap.sh
+  - name: /usr/local/sbin/galera_init.sh
   - require:
     - file: galera_run_dir
-    - file: galera_bootstrap_script
+    - file: galera_init_script
 
 galera_bootstrap_set_root_password:
   cmd.run:
diff --git a/galera/slave.sls b/galera/slave.sls
index 4a47c0c..1b99ec6 100644
--- a/galera/slave.sls
+++ b/galera/slave.sls
@@ -62,21 +62,32 @@
 
 {%- endif %}
 
+galera_init_script:
+  file.managed:
+  - name: /usr/local/sbin/galera_init.sh
+  - mode: 755
+  - source: salt://galera/files/init_bootstrap.sh
+  - defaults:
+      service: {{ slave|yaml }}
+  - template: jinja
+
 galera_bootstrap_script:
   file.managed:
   - name: /usr/local/sbin/galera_bootstrap.sh
   - mode: 755
+  - defaults:
+      service: {{ slave|yaml }}
   - source: salt://galera/files/bootstrap.sh
   - template: jinja
 
 {%- if salt['cmd.run']('test -e /var/lib/mysql/.galera_bootstrap; echo $?') != '0'  %}
 
-galera_bootstrap_start_service:
+galera_init_start_service:
   cmd.run:
-  - name: /usr/local/sbin/galera_bootstrap.sh
+  - name: /usr/local/sbin/galera_init.sh
   - require: 
     - file: galera_run_dir
-    - file: galera_bootstrap_script
+    - file: galera_init_script
 
 galera_bootstrap_set_root_password:
   cmd.run: