diff --git a/tasks/galera_upgrade_post.yml b/tasks/galera_upgrade_post.yml
index a38db7dc..f1c73625 100644
--- a/tasks/galera_upgrade_post.yml
+++ b/tasks/galera_upgrade_post.yml
@@ -17,6 +17,13 @@
   service:
     name: mysql
     state: started
+  # NOTE (hwoarang) Sometimes the service fails to start on the first attempt
+  # so just try a few more times before giving up. Clearly this needs to be
+  # investigated at some point...
+  register: mysql_service_started
+  until: mysql_service_started | success
+  retries: "{{ num_retries }}"
+  delay: "{{ wait_delay }}"
   tags:
     - galera-upgrade
 
diff --git a/tasks/main.yml b/tasks/main.yml
index f9a3f7b6..59ae2b41 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -57,7 +57,9 @@
   tags: galera_server-config
 
 - include: galera_upgrade_post.yml
-  static: no
+  vars:
+    num_retries: 3
+    wait_delay: 3
   tags: galera_server-upgrade
   when:
     - galera_upgrade | bool