diff --git a/tasks/galera_running_check.yml b/tasks/galera_running_check.yml
index c56059a7..f31a0b2a 100644
--- a/tasks/galera_running_check.yml
+++ b/tasks/galera_running_check.yml
@@ -25,6 +25,21 @@
     - galera-cluster-state-check
     - galera-bootstrap
 
+- name: Check that WSREP is ready
+  shell: "/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf extended-status | egrep '(wsrep_ready|wsrep_evs_state)'"
+  changed_when: >
+    _mysql_ready.rc != 0
+  register: _mysql_ready
+  when: _mysql_running.rc == 0
+  until:
+    - _mysql_ready.rc == 0
+    - (_mysql_ready.stdout).find("ON") != -1
+  retries: "{{ num_retries }}"
+  delay: "{{ wait_delay }}"
+  tags:
+    - galera-cluster-state-check
+    - galera-bootstrap
+
 - name: Set running state fact
   set_fact:
     mysql_running: "{{ _mysql_running }}"
diff --git a/tasks/galera_setup.yml b/tasks/galera_setup.yml
index cac52750..390d8b8c 100644
--- a/tasks/galera_setup.yml
+++ b/tasks/galera_setup.yml
@@ -41,5 +41,9 @@
       password: "{{ galera_monitoring_user_password }}"
       priv: "*.*:USAGE"
       state: present
+  register: galera_users
+  until: galera_users | success
+  retries: 10
+  delay: 3
   tags:
     - galera-user-create
diff --git a/tasks/galera_upgrade_post.yml b/tasks/galera_upgrade_post.yml
index 2bc0f1ef..28a3e1b4 100644
--- a/tasks/galera_upgrade_post.yml
+++ b/tasks/galera_upgrade_post.yml
@@ -35,11 +35,15 @@
 
 - include: galera_running_check.yml
   vars:
-    num_retries: 1
+    num_retries: 10
     wait_delay: 3
 
 - name: Run MySQL Upgrade
   command: "/usr/bin/mysql_upgrade"
+  register: galera_mysql_upgrade
+  until: galera_mysql_upgrade | success
+  retries: 3
+  delay: 10
   when:
     - galera_upgrade | bool
   tags: