diff --git a/roles/openqa/dispatcher/tasks/main.yml b/roles/openqa/dispatcher/tasks/main.yml
index 40a3b5d184..0eec52b755 100644
--- a/roles/openqa/dispatcher/tasks/main.yml
+++ b/roles/openqa/dispatcher/tasks/main.yml
@@ -68,7 +68,7 @@
 #  - packages
 
 - name: Install required packages
-  dnf:
+  package:
     name: ['python3-fedfind', 'python3-wikitcms', 'python3-openqa_client', 'python3-requests',
            'python3-resultsdb_api', 'python3-resultsdb_conventions-fedora', 'python3-setuptools',
            'python3-six']
@@ -77,7 +77,7 @@
   - packages
 
 - name: Install required packages (fedmsg)
-  dnf:
+  package:
     name: python3-fedmsg
     state: present
   when: "not openqa_fedoramessaging|bool"
@@ -85,7 +85,7 @@
   - packages
 
 - name: Install required packages (fedora-messaging)
-  dnf:
+  package:
     name: fedora-messaging
     state: present
   when: "openqa_fedoramessaging|bool"
@@ -93,7 +93,7 @@
   - packages
 
 - name: Install required packages (wiki oidc auth)
-  dnf:
+  package:
     name: python3-openidc-client
     state: present
   when: "wikitcms_token is defined"
diff --git a/roles/openqa/server/tasks/main.yml b/roles/openqa/server/tasks/main.yml
index 5d8982c16a..e9e9870ea7 100644
--- a/roles/openqa/server/tasks/main.yml
+++ b/roles/openqa/server/tasks/main.yml
@@ -68,7 +68,7 @@
 # this is separate from the step below so we can easily flip it between
 # stable and testing
 - name: Install openQA packages
-  dnf:
+  package:
     name: ['openqa', 'openqa-httpd', 'openqa-plugin-fedmsg', 'openqa-plugin-fedoraupdaterestart',
            'python3-fedfind']
     state: present
@@ -77,7 +77,7 @@
   - packages
 
 - name: Install various other required packages
-  dnf:
+  package:
     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',
diff --git a/roles/openqa/worker/tasks/createhdds.yml b/roles/openqa/worker/tasks/createhdds.yml
index b7f376319c..76072ab0c3 100644
--- a/roles/openqa/worker/tasks/createhdds.yml
+++ b/roles/openqa/worker/tasks/createhdds.yml
@@ -2,7 +2,7 @@
 # (none)
 
 - name: Install required packages
-  dnf:
+  package:
     name: ['libsemanage-python', 'libvirt-daemon-kvm', 'libvirt-python3', 'python3-libguestfs',
            'python3-fedfind', 'qemu-kvm', 'virt-install', 'withlock']
     state: present
@@ -10,7 +10,7 @@
   - packages
 
 - name: Install PowerPC-specific packages
-  dnf: name=powerpc-utils state=present
+  package: name=powerpc-utils state=present
   when: ansible_architecture == 'ppc64' or ansible_architecture == 'ppc64le'
   tags:
   - packages
diff --git a/roles/openqa/worker/tasks/main.yml b/roles/openqa/worker/tasks/main.yml
index 961b2638cc..799867ced4 100644
--- a/roles/openqa/worker/tasks/main.yml
+++ b/roles/openqa/worker/tasks/main.yml
@@ -16,7 +16,7 @@
 ##               installed and rngd.service enabled/started
 
 - name: Install required packages (testing)
-  dnf:
+  package:
     name: ['openqa-worker']
     state: present
     enablerepo: "updates-testing"
@@ -24,32 +24,32 @@
   - packages
 
 - name: Install packages
-  dnf:
+  package:
     name: ['libselinux-python', 'git']
     state: present
   tags:
   - packages
 
 - name: Install UEFI firmware package (x86_64 only)
-  dnf: name=edk2-ovmf state=present
+  package: name=edk2-ovmf state=present
   tags:
   - packages
   when: "ansible_architecture is defined and ansible_architecture == 'x86_64'"
 
 - name: Install UEFI firmware package (aarch64 only)
-  dnf: name=edk2-aarch64 state=present
+  package: name=edk2-aarch64 state=present
   tags:
   - packages
   when: "ansible_architecture is defined and ansible_architecture == 'aarch64'"
 
 - name: Install arm UEFI firmware package (aarch64 only)
-  dnf: name=edk2-arm state=present
+  package: name=edk2-arm state=present
   tags:
   - packages
   when: "ansible_architecture is defined and ansible_architecture == 'aarch64'"
 
 - name: Install rng-tools (if specified by openqa_rngd var)
-  dnf: name=rng-tools state=present
+  package: name=rng-tools state=present
   tags:
   - packages
   when: "openqa_rngd is defined and openqa_rngd"
diff --git a/roles/openqa/worker/tasks/nfs-client.yml b/roles/openqa/worker/tasks/nfs-client.yml
index 2eedd0ec3f..b49b5ec9a6 100644
--- a/roles/openqa/worker/tasks/nfs-client.yml
+++ b/roles/openqa/worker/tasks/nfs-client.yml
@@ -3,7 +3,7 @@
 ##      string - hostname of the openQA server (we assume it is hosting the NFS mount)
 
 - name: Install NFS client
-  dnf: name=nfs-utils state=present
+  package: name=nfs-utils state=present
   tags:
   - packages
 
diff --git a/roles/openqa/worker/tasks/tap-setup.yml b/roles/openqa/worker/tasks/tap-setup.yml
index 9329238410..5949dd7395 100644
--- a/roles/openqa/worker/tasks/tap-setup.yml
+++ b/roles/openqa/worker/tasks/tap-setup.yml
@@ -1,12 +1,12 @@
 - name: Install packages
-  dnf:
+  package:
     name: ['os-autoinst-openvswitch', 'tunctl']
     state: present
   tags:
   - packages
 
 - name: Install network-scripts (on F29+)
-  dnf:
+  package:
     name: 'network-scripts'
     state: present
   tags: