diff --git a/roles/openqa/server/tasks/main.yml b/roles/openqa/server/tasks/main.yml
index 967a3a386e..2776a0c7e1 100644
--- a/roles/openqa/server/tasks/main.yml
+++ b/roles/openqa/server/tasks/main.yml
@@ -94,6 +94,24 @@
     creates: /var/lib/openqa/share/factory/hdd/disk_full_mbr.img
     chdir: /var/lib/openqa/share/factory/hdd/
 
+- name: Create N-2 desktop x86_64 disk image (this may take a long time!)
+  command: "/root/openqa_fedora_tools/tools/createhdds.sh 22 desktop_64bit"
+  args:
+    creates: /var/lib/openqa/share/factory/hdd/disk_f22_desktop_x86_64.img
+    chdir: /var/lib/openqa/share/factory/hdd/
+
+- name: Create N-2 desktop i686 disk image (this may take a long time!)
+  command: "/root/openqa_fedora_tools/tools/createhdds.sh 22 desktop_32bit"
+  args:
+    creates: /var/lib/openqa/share/factory/hdd/disk_f22_desktop_i686.img
+    chdir: /var/lib/openqa/share/factory/hdd/
+
+- name: Create N-2 minimal x86_64 disk image (this may take a long time!)
+  command: "/root/openqa_fedora_tools/tools/createhdds.sh 22 minimal_64bit"
+  args:
+    creates: /var/lib/openqa/share/factory/hdd/disk_f22_minimal_x86_64.img
+    chdir: /var/lib/openqa/share/factory/hdd/
+
 - name: Stop libvirt service
   service: name=libvirtd state=stopped