diff --git a/defaults/main.yml b/defaults/main.yml
index ffe8864..f21ace4 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -136,6 +136,6 @@ percona_repository: 'http://repo.percona.com/apt'
 
 
 # Galera
-mysql_galera_bootstrap: false
+mysql_galera_resetup: false
 mariadb_galera_members: []
 mysql_galera_primary_node: 'change_me' # See: https://github.com/ansible/ansible/issues/17453
diff --git a/tasks/galera/bootstrap.yml b/tasks/galera/bootstrap.yml
index ec2628d..4d094eb 100644
--- a/tasks/galera/bootstrap.yml
+++ b/tasks/galera/bootstrap.yml
@@ -23,7 +23,7 @@
       register: bootstrap_run
       when: ansible_service_mgr != 'systemd'
 
-  when: not s.stat.exists
+  when: not s.stat.exists or mysql_galera_resetup
 
 - name: COMMAND | Create Bootstrap mark
   command: "touch {{ booboo }}"
diff --git a/tasks/main.yml b/tasks/main.yml
index 5e5e00d..878af9a 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -19,8 +19,8 @@
 - name: SERVICE | Restart now (prevent bugs)
   service: name=mysql state=restarted
   when: >
-    config.changed or
-    extraconfig.changed
+    (config.changed or extraconfig.changed) and
+    not mysql_galera_resetup
 
 - name: TEMPLATE Create .my.cnf for root
   template: src=root/my.cnf dest=/root/.my.cnf owner=root group=root mode=0600 backup=yes