diff --git a/roles/upload-image-s3/README.rst b/roles/upload-image-s3/README.rst
index 7f7f92aef..a0c778351 100644
--- a/roles/upload-image-s3/README.rst
+++ b/roles/upload-image-s3/README.rst
@@ -79,7 +79,7 @@ zuul-launcher expects.
    `false`.
 
 .. zuul:rolevar:: upload_image_s3_hash_timeout
-   :default: 600
+   :default: 86400
 
    The async timeout for md5/sha256 image hash tasks.
 
diff --git a/roles/upload-image-s3/defaults/main.yaml b/roles/upload-image-s3/defaults/main.yaml
index 96b3e2619..539fe5195 100644
--- a/roles/upload-image-s3/defaults/main.yaml
+++ b/roles/upload-image-s3/defaults/main.yaml
@@ -4,5 +4,6 @@ upload_image_s3_filename: '{{ build_diskimage_image_root }}/{{ build_diskimage_i
 upload_image_s3_name: '{{ zuul.build }}-{{ build_diskimage_image_name | default(zuul.image_build_name) }}.{{ upload_image_s3_extension }}'
 upload_image_s3_extension: '{{ upload_image_s3_format }}'
 upload_image_s3_compress_image: true
-upload_image_s3_hash_timeout: 600
+# 24 hours
+upload_image_s3_hash_timeout: 86400
 upload_image_s3_export_s3_url: false
diff --git a/roles/upload-image-swift/README.rst b/roles/upload-image-swift/README.rst
index 969f45f80..a8fb53286 100644
--- a/roles/upload-image-swift/README.rst
+++ b/roles/upload-image-swift/README.rst
@@ -72,6 +72,6 @@ expects.
    should be set to `false`.
 
 .. zuul:rolevar:: upload_image_swift_hash_timeout
-    :default: 600
+    :default: 86400
 
     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 85e21cc1f..25172d166 100644
--- a/roles/upload-image-swift/defaults/main.yaml
+++ b/roles/upload-image-swift/defaults/main.yaml
@@ -4,4 +4,5 @@ upload_image_swift_filename: '{{ build_diskimage_image_root }}/{{ build_diskimag
 upload_image_swift_name: '{{ zuul.build }}-{{ build_diskimage_image_name | default(zuul.image_build_name) }}.{{ upload_image_swift_extension }}'
 upload_image_swift_extension: '{{ upload_image_swift_format }}'
 upload_image_swift_compress_image: true
-upload_image_swift_hash_timeout: 600
+# 24 hours
+upload_image_swift_hash_timeout: 86400