diff --git a/tasks/galera_server_main.yml b/tasks/galera_server_main.yml
index 38943b0c..139c57b9 100644
--- a/tasks/galera_server_main.yml
+++ b/tasks/galera_server_main.yml
@@ -73,34 +73,58 @@
 
 - include_tasks: galera_server_upgrade.yml
   when: galera_deployed | bool
+  args:
+    apply:
+      tags:
+        - galera_server-upgrade
   tags:
-    - galera_server-upgrade
+    - always
 
 - include_tasks: galera_server_install.yml
+  args:
+    apply:
+      tags:
+        - galera_server-install
   tags:
-    - galera_server-install
+    - always
 
 - include_tasks: galera_server_post_install.yml
+  args:
+    apply:
+      tags:
+        - galera_server-config
   tags:
-    - galera_server-config
+    - always
 
 - name: Flush handlers
   meta: flush_handlers
 
 - include_tasks: galera_server_setup.yml
   when: inventory_hostname == galera_server_bootstrap_node
+  args:
+    apply:
+      tags:
+        - galera_server-config
   tags:
-    - galera_server-config
+    - always
 
 - include_tasks: tasks/galera_server_xinetd.yml
-  tags:
-    - galera_server-config
   when:
     - galera_monitoring_check_enabled | bool
+  args:
+    apply:
+      tags:
+        - galera_server-config
+  tags:
+    - always
 
 - include_tasks: galera_server_backups.yml
   when:
     - galera_mariadb_backups_enabled | bool
     - inventory_hostname in galera_mariadb_backups_nodes
+  args:
+    apply:
+      tags:
+        - galera_server-backups
   tags:
-    - galera_server-backups
+    - always
diff --git a/tasks/galera_server_upgrade.yml b/tasks/galera_server_upgrade.yml
index ddaec643..6e5b560a 100644
--- a/tasks/galera_server_upgrade.yml
+++ b/tasks/galera_server_upgrade.yml
@@ -40,5 +40,9 @@
 - include_tasks: galera_server_upgrade_pre.yml
   when:
     - galera_upgrade | bool
+  args:
+    apply:
+      tags:
+        - galera_server-upgrade
   tags:
-    - galera_server-upgrade
+    - always
diff --git a/tasks/main.yml b/tasks/main.yml
index c0e19be7..43cd447b 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -28,11 +28,29 @@
   when:
     - galera_install_client | bool
     - inventory_hostname not in galera_cluster_members or galera_root_user != 'root'
+  args:
+    apply:
+      tags:
+        - galera-client
+  tags:
+    - always
 
 - include_tasks: galera_devel_main.yml
   when:
     - galera_install_devel | bool
+  args:
+    apply:
+      tags:
+        - galera-devel
+  tags:
+    - always
 
 - include_tasks: galera_server_main.yml
   when:
     - galera_install_server | bool
+  args:
+    apply:
+      tags:
+        - galera-server
+  tags:
+    - always