diff --git a/roles/openqa/server/files/createhdds b/roles/openqa/server/files/createhdds
deleted file mode 100644
index 794d80450e..0000000000
--- a/roles/openqa/server/files/createhdds
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-cd /var/lib/openqa/share/factory/hdd/fixed
-LIBGUESTFS_BACKEND=direct withlock /var/lock/createhdds.lock /root/createhdds/createhdds.py all --clean
diff --git a/roles/openqa/server/tasks/main.yml b/roles/openqa/server/tasks/main.yml
index 2e9173f3d8..cdd9f3afb4 100644
--- a/roles/openqa/server/tasks/main.yml
+++ b/roles/openqa/server/tasks/main.yml
@@ -148,8 +148,11 @@
 # for these packages
 - name: Install openQA packages
   package:
-    name: ['openqa', 'openqa-httpd', 'openqa-plugin-fedora-messaging', 'openqa-plugin-fedoraupdaterestart',
-           'python3-fedfind']
+    name:
+      - openqa
+      - openqa-httpd
+      - openqa-plugin-fedora-messaging
+      - openqa-plugin-fedoraupdaterestart
     state: latest
     enablerepo: "{{ openqa_repo }}"
   tags:
@@ -157,10 +160,15 @@
 
 - name: Install various other required packages
   package:
-    name: ['python3-libselinux', 'git', 'jq', 'libselinux-utils', 'python3-libsemanage',
-           'nfs-utils', 'perl(Class::DBI::Pg)', 'expect', 'libguestfs-tools-c', 'libguestfs-xfs',
-           'libvirt-daemon-config-network', 'libvirt-python3', 'python3-libguestfs',
-           'virt-install', 'withlock', 'genisoimage']
+    name:
+      - python3-libselinux # for custom SELinux policy
+      - git # for checking out tests/tools
+      - jq # for checking if tests changed after template load
+      - libselinux-utils # custom SELinux policy
+      - python3-libsemanage # custom SELinux policy
+      - nfs-utils # for configuring/running NFS server
+      - perl(Class::DBI::Pg) # for using postgresql DB
+      - genisoimage # for building cloud-init ISO
     state: present
   tags:
   - packages