diff --git a/roles/releng/tasks/main.yml b/roles/releng/tasks/main.yml
index de57fbb81a..1879abef8b 100644
--- a/roles/releng/tasks/main.yml
+++ b/roles/releng/tasks/main.yml
@@ -63,28 +63,6 @@
     - /mnt/fedora_koji
     - /var/spool/rsyslog
 
-- name: add pkgs
-  yum: state=present pkg={{ item }}
-  with_items:
-    - yum-utils
-    - koji
-    - strace
-    - mock
-    - nfs-utils
-    - git
-    - mash
-    - intltool
-    - mutt
-    - createrepo
-    - pykickstart
-    - pyliblzma
-    - httpd
-    - hardlink
-    - pungi
-    - pungi-utils
-    - compose-utils
-  when: ansible_distribution_major_version|int < 22
-
 - name: add pkgs
   dnf: state=present pkg={{ item }}
   with_items:
@@ -103,11 +81,15 @@
     - httpd
     - hardlink
     - pungi
-    - pungi-utils
     - compose-utils
     - python-scandir
     - python2-productmd
-  when: ansible_distribution_major_version|int > 21
+
+- name: add pkgs
+  dnf: state=present pkg={{ item }}
+  with_items:
+    - pungi-utils
+  when: "'releng-compose' in group_names"
 
 # add sigul to secondary arch compose boxes
 - name: add pkgs