diff --git a/tasks/galera_upgrade_check.yml b/tasks/galera_upgrade_check.yml
index 2c51236c..193a0c3a 100644
--- a/tasks/galera_upgrade_check.yml
+++ b/tasks/galera_upgrade_check.yml
@@ -13,19 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- include: galera_upgrade_check_apt.yml
-  static: no
-  when:
-    - ansible_pkg_mgr == 'apt'
-  tags:
-    - install-apt
-
-- include: galera_upgrade_check_yum.yml
-  static: no
-  when:
-    - ansible_pkg_mgr == 'yum'
+- include: "galera_upgrade_check_{{ ansible_pkg_mgr }}.yml"
   tags:
     - install-apt
+    - install-yum
 
 - include: galera_upgrade_pre.yml
   static: no