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