diff --git a/roles/openqa/server/tasks/main.yml b/roles/openqa/server/tasks/main.yml
index 8e89b92155..9935d96b1c 100644
--- a/roles/openqa/server/tasks/main.yml
+++ b/roles/openqa/server/tasks/main.yml
@@ -189,11 +189,6 @@
 - name: Remove old openqa_fedora_tools checkout
   file: path=/root/openqa_fedora_tools state=absent
 
-- name: Check out createhdds
-  git:
-    repo: https://pagure.io/fedora-qa/createhdds.git # noqa 401
-    dest: /root/createhdds
-
 - name: Create asset directories
   file: path={{ item }} state=directory owner=geekotest group=root mode=0755
   with_items:
@@ -204,38 +199,6 @@
   - /var/lib/openqa/share/factory/repo
   - /var/lib/openqa/share/factory/other
 
-#- name: Set up createhdds cron job
-#  copy: src=createhdds dest=/etc/cron.daily/createhdds owner=root group=root mode=0755
-
-# While #1539330 is a thing, we probably don't want the servers
-# crashing every day...
-- name: Remove createhdds cron job (#1539330)
-  file: path=/etc/cron.daily/createhdds state=absent
-
-- name: Check if any hard disk images need (re)building
-  command: "/root/createhdds/createhdds.py check"
-  args:
-    chdir: /var/lib/openqa/share/factory/hdd/fixed
-  register: diskcheck
-  failed_when: "1 != 1"
-  changed_when: "1 != 1"
-  check_mode: no
-
-- name: Ensure libvirt is running if needed to create images
-  service: name=libvirtd enabled=yes state=started
-  when: "diskcheck.rc > 1"
-
-# > 1 is not a typo; check exits with 1 if all images are present but some
-# are outdated, and 2 if any images are missing. We only want to handle
-# outright *missing* images here in the playbook (to handle the case of
-# first deployment). Outdated images are handled by the daily cron run.
-
-# disabled due to #1539330
-#- name: Create hard disk images (this may take a long time!)
-#  command: "/etc/cron.daily/createhdds"
-#  when: "diskcheck.rc > 1"
-#  ignore_errors: yes
-
 - name: Copy in meta-data for cloud-init ISO creation
   copy: src=meta-data dest=/var/tmp/meta-data owner=root group=root mode=0644