diff --git a/tasks/galera_install_apt.yml b/tasks/galera_install_apt.yml
index 53cd7e16..52eaaf9f 100644
--- a/tasks/galera_install_apt.yml
+++ b/tasks/galera_install_apt.yml
@@ -111,8 +111,6 @@
     dest: "/usr/sbin/policy-rc.d"
     mode: "0755"
     backup: yes
-  tags:
-    - galera-config
 
 - name: Install galera packages
   apt:
@@ -159,4 +157,4 @@
     path: "/usr/sbin/policy-rc.d"
     state: absent
   tags:
-    - galera-config
+    - galera_server-config
diff --git a/tasks/galera_install_yum.yml b/tasks/galera_install_yum.yml
index 7f827de1..c156f998 100644
--- a/tasks/galera_install_yum.yml
+++ b/tasks/galera_install_yum.yml
@@ -25,8 +25,6 @@
     - { src: "/usr/lib64/galera", path: "/usr/lib/galera", state: "link", force: true }
     - { src: "/etc/mysql/conf.d", path: "/etc/my.cnf.d", state: "link", force: true }
     - { src: "/etc/mysql/my.cnf", path: "/etc/my.cnf", state: "link", force: true }
-  tags:
-    - galera-config
 
 - name: Add galera gpg-keys
   rpm_key:
@@ -123,6 +121,7 @@
     name: "mysql"
     enabled: "yes"
   tags:
+    - galera_server-config
     - galera-enable
 
 # NOTE(cloudnull): This is an idempotent shell task is it will only run once
@@ -149,5 +148,6 @@
   args:
     creates: /etc/mysql/rhel_configured
   tags:
+    - galera_server-config
     - galera-rhel-config
     - skip_ansible_lint
diff --git a/tasks/main.yml b/tasks/main.yml
index c588e595..9ca5d7ad 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -37,11 +37,22 @@
     - always
 
 - include: galera_upgrade_check.yml
+  tags: galera_server-upgrade
+
 - include: galera_cluster_state.yml
+  tags: galera_server-config
+
 - include: galera_pre_install.yml
+  tags: galera_server-install
+
 - include: galera_install.yml
+  tags: galera_server-install
+
 - include: galera_post_install.yml
+  tags: galera_server-config
+
 - include: galera_bootstrap.yml
+  tags: galera_server-config
 
 - name: Flush handlers
   meta: flush_handlers
@@ -50,6 +61,8 @@
   vars:
     num_retries: 10
     wait_delay: 3
+  tags: galera_server-config
 
 - include: galera_setup.yml
   when: inventory_hostname == galera_server_bootstrap_node
+  tags: galera_server-config