diff --git a/roles/upload-image-swift/README.rst b/roles/upload-image-swift/README.rst
index 8204959fa..76b6cdbee 100644
--- a/roles/upload-image-swift/README.rst
+++ b/roles/upload-image-swift/README.rst
@@ -60,3 +60,8 @@ expects.
    :default: `{{ zuul.build }}-{{ build_diskimage_image_name }}.{{ upload_image_swift_extension }}`
 
    The object name to use when uploading.
+
+.. zuul:rolevar:: upload_image_swift_hash_timeout
+    :default: 600
+
+    The async timeout for md5/sha256 image hash tasks.
diff --git a/roles/upload-image-swift/defaults/main.yaml b/roles/upload-image-swift/defaults/main.yaml
index 53864f994..044d22bd0 100644
--- a/roles/upload-image-swift/defaults/main.yaml
+++ b/roles/upload-image-swift/defaults/main.yaml
@@ -3,3 +3,4 @@ upload_image_swift_delete_after: 0
 upload_image_swift_filename: '{{ build_diskimage_image_root }}/{{ build_diskimage_image_name }}.{{ upload_image_swift_extension }}'
 upload_image_swift_name: '{{ zuul.build }}-{{ build_diskimage_image_name }}.{{ upload_image_swift_extension }}'
 upload_image_swift_extension: '{{ upload_image_swift_format }}'
+upload_image_swift_hash_timeout: 600
diff --git a/roles/upload-image-swift/tasks/main.yaml b/roles/upload-image-swift/tasks/main.yaml
index 2691f036b..cab9b860b 100644
--- a/roles/upload-image-swift/tasks/main.yaml
+++ b/roles/upload-image-swift/tasks/main.yaml
@@ -3,7 +3,7 @@
   stat:
     path: '{{ upload_image_swift_filename }}'
     checksum_algorithm: sha256
-  async: 600
+  async: '{{ upload_image_swift_hash_timeout }}'
   poll: 0
   register: sha256_task
 
@@ -11,7 +11,7 @@
   stat:
     path: '{{ upload_image_swift_filename }}'
     checksum_algorithm: md5
-  async: 600
+  async: '{{ upload_image_swift_hash_timeout }}'
   poll: 0
   register: md5_task
 
@@ -55,7 +55,7 @@
     jid: "{{ sha256_task.ansible_job_id }}"
   register: sha256
   until: sha256.finished
-  retries: 1
+  retries: "{{ (upload_image_swift_hash_timeout > 10) | ternary(upload_image_swift_hash_timeout // 10, 10) }}"
   delay: 10
 
 - name: Wait for md5
@@ -63,7 +63,7 @@
     jid: "{{ md5_task.ansible_job_id }}"
   register: md5
   until: md5.finished
-  retries: 1
+  retries: "{{ (upload_image_swift_hash_timeout > 10) | ternary(upload_image_swift_hash_timeout // 10, 10) }}"
   delay: 10
 
 - name: Return artifact to Zuul