diff --git a/roles/openqa/server/tasks/main.yml b/roles/openqa/server/tasks/main.yml
index ccdeec6f0c..3e817c1fc6 100644
--- a/roles/openqa/server/tasks/main.yml
+++ b/roles/openqa/server/tasks/main.yml
@@ -68,36 +68,21 @@
 # this is separate from the step below so we can easily flip it between
 # stable and testing
 - name: Install openQA packages
-  dnf: name={{ item }} state=present enablerepo="updates-testing"
-  with_items:
-  - openqa
-  - openqa-httpd
-  - openqa-plugin-fedmsg
-  - openqa-plugin-fedoraupdaterestart
-  - python2-fedfind
-  - python3-fedfind
+  dnf:
+    name: ['openqa', 'openqa-httpd', 'openqa-plugin-fedmsg', 'openqa-plugin-fedoraupdaterestart',
+           'python2-fedfind', 'python3-fedfind']
+    state: present
+    enablerepo: "updates-testing"
   tags:
   - packages
 
 - name: Install various other required packages
-  dnf: name={{ item }} state=present
-  with_items:
-  - libselinux-python
-  - git
-  - json_diff
-  - libselinux-utils
-  - libsemanage-python
-  - nfs-utils
-  - perl(Class::DBI::Pg)
-  - perl(DateTime::Format::Pg)
-  - expect
-  - libguestfs-tools-c
-  - libguestfs-xfs
-  - libvirt-daemon-config-network
-  - libvirt-python3
-  - python3-libguestfs
-  - virt-install
-  - withlock
+  dnf:
+    name: ['libselinux-python', 'git', 'json_diff', 'libselinux-utils', 'libsemanage-python',
+           'nfs-utils', 'perl(Class::DBI::Pg)', 'expect', 'libguestfs-tools-c', 'libguestfs-xfs',
+           'libvirt-daemon-config-network', 'libvirt-python3', 'python3-libguestfs',
+           'virt-install', 'withlock']
+    state: present
   tags:
   - packages
 
diff --git a/roles/openqa/worker/tasks/createhdds.yml b/roles/openqa/worker/tasks/createhdds.yml
index e2433007cb..b7f376319c 100644
--- a/roles/openqa/worker/tasks/createhdds.yml
+++ b/roles/openqa/worker/tasks/createhdds.yml
@@ -2,16 +2,10 @@
 # (none)
 
 - name: Install required packages
-  dnf: name={{ item }} state=present
-  with_items:
-  - libsemanage-python
-  - libvirt-daemon-kvm
-  - libvirt-python3
-  - python3-libguestfs
-  - python3-fedfind
-  - qemu-kvm
-  - virt-install
-  - withlock
+  dnf:
+    name: ['libsemanage-python', 'libvirt-daemon-kvm', 'libvirt-python3', 'python3-libguestfs',
+           'python3-fedfind', 'qemu-kvm', 'virt-install', 'withlock']
+    state: present
   tags:
   - packages
 
diff --git a/roles/openqa/worker/tasks/main.yml b/roles/openqa/worker/tasks/main.yml
index a121d6ea95..dd4a60eb07 100644
--- a/roles/openqa/worker/tasks/main.yml
+++ b/roles/openqa/worker/tasks/main.yml
@@ -16,17 +16,17 @@
 ##               installed and rngd.service enabled/started
 
 - name: Install required packages (testing)
-  dnf: name={{ item }} state=present enablerepo="updates-testing"
-  with_items:
-  - openqa-worker
+  dnf:
+    name: ['openqa-worker']
+    state: present
+    enablerepo: "updates-testing"
   tags:
   - packages
 
 - name: Install packages
-  dnf: name={{ item }} state=present
-  with_items:
-  - libselinux-python
-  - git
+  dnf:
+    name: ['libselinux-python', 'git']
+    state: present
   tags:
   - packages
 
diff --git a/roles/openqa/worker/tasks/tap-setup.yml b/roles/openqa/worker/tasks/tap-setup.yml
index bd49cb60c7..279cea11de 100644
--- a/roles/openqa/worker/tasks/tap-setup.yml
+++ b/roles/openqa/worker/tasks/tap-setup.yml
@@ -1,8 +1,7 @@
 - name: Install packages
-  dnf: name={{ item }} state=present
-  with_items:
-  - os-autoinst-openvswitch
-  - tunctl
+  dnf:
+    name: ['os-autoinst-openvswitch', 'tunctl']
+    state: present
   tags:
   - packages
 
diff --git a/roles/relvalconsumer/tasks/main.yml b/roles/relvalconsumer/tasks/main.yml
index decb2f404e..9403b8e118 100644
--- a/roles/relvalconsumer/tasks/main.yml
+++ b/roles/relvalconsumer/tasks/main.yml
@@ -16,29 +16,23 @@
 
 # note: kept around for when we need packages from u-t
 #- name: Install required packages (testing)
-#  dnf: name={{ item }} state=present enablerepo="updates-testing"
-#  with_items:
-#  - python2-fedfind
-#  - python2-wikitcms
+#  dnf:
+#    name: ['python2-fedfind', 'python2-wikitcms']
+#    state: present
+#    enablerepo: "updates-testing"
 #  tags:
 #  - packages
 
 - name: Install required packages
-  dnf: name={{ item }} state=present
-  with_items:
-  - python2-fedfind
-  - python2-wikitcms
-  - python2-fedmsg-consumers
-  - python2-mwclient
-  - python-setuptools
-  - relval
+  dnf:
+    name: ['python2-fedfind', 'python2-wikitcms', 'python2-fedmsg-consumers', 'python2-mwclient',
+           'python2-setuptools', 'relval']
+    state: present
   tags:
   - packages
 
 - name: Install required packages (wiki oidc auth)
-  dnf: name={{ item }} state=present enablerepo="updates"
-  with_items:
-  - python2-openidc-client
+  dnf: name=python2-openidc-client state=present enablerepo="updates"
   when: "wikitcms_token is defined"
   tags:
   - packages