diff --git a/playbooks/manual/update-packages.yml b/playbooks/manual/update-packages.yml
index 4c86a730a5..ac39602d91 100644
--- a/playbooks/manual/update-packages.yml
+++ b/playbooks/manual/update-packages.yml
@@ -17,8 +17,17 @@
 
   - name: yum update {{ package }} from main repo
     yum: name="{{ package }}" state=latest update_cache=yes
-    when: not testing
+    when: not testing and ansible_distribution_major_version|int < 22
 
   - name: yum update {{ package }} from testing repo
     yum: name="{{ package }}" state=latest enablerepo=infrastructure-testing update_cache=yes
-    when: testing
+    when: testing and ansible_distribution_major_version|int < 22
+
+  - name: yum update {{ package }} from main repo
+    dnf: name="{{ package }}" state=latest update_cache=yes
+    when: not testing and ansible_distribution_major_version|int > 22
+
+  - name: yum update {{ package }} from testing repo
+    dnf: name="{{ package }}" state=latest enablerepo=infrastructure-testing update_cache=yes
+    when: testing and ansible_distribution_major_version|int > 22
+