diff --git a/roles/openqa/server/tasks/main.yml b/roles/openqa/server/tasks/main.yml
index 676c8ebb7e..5b44bb454d 100644
--- a/roles/openqa/server/tasks/main.yml
+++ b/roles/openqa/server/tasks/main.yml
@@ -142,8 +142,13 @@
   - /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
+#- 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"
diff --git a/roles/openqa/worker/tasks/createhdds.yml b/roles/openqa/worker/tasks/createhdds.yml
index 20a637999d..44addbb6fb 100644
--- a/roles/openqa/worker/tasks/createhdds.yml
+++ b/roles/openqa/worker/tasks/createhdds.yml
@@ -39,8 +39,13 @@
     repo: https://pagure.io/fedora-qa/createhdds.git
     dest: /root/createhdds
 
-- name: Set up createhdds cron job
-  copy: src=createhdds dest=/etc/cron.daily/createhdds owner=root group=root mode=0755
+#- 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 these boxes
+# 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"