diff --git a/roles/upload-image-s3/defaults/main.yaml b/roles/upload-image-s3/defaults/main.yaml
index 802461614..96b3e2619 100644
--- a/roles/upload-image-s3/defaults/main.yaml
+++ b/roles/upload-image-s3/defaults/main.yaml
@@ -1,7 +1,7 @@
 upload_image_s3_image_name: '{{ build_diskimage_image_name | default(zuul.image_build_name) }}'
 upload_image_s3_delete_after: 0
-upload_image_s3_filename: '{{ build_diskimage_image_root }}/{{ build_diskimage_image_name }}.{{ upload_image_s3_extension }}'
-upload_image_s3_name: '{{ zuul.build }}-{{ build_diskimage_image_name }}.{{ upload_image_s3_extension }}'
+upload_image_s3_filename: '{{ build_diskimage_image_root }}/{{ build_diskimage_image_name | default(zuul.image_build_name) }}.{{ upload_image_s3_extension }}'
+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
diff --git a/roles/upload-image-swift/defaults/main.yaml b/roles/upload-image-swift/defaults/main.yaml
index 907d0440e..85e21cc1f 100644
--- a/roles/upload-image-swift/defaults/main.yaml
+++ b/roles/upload-image-swift/defaults/main.yaml
@@ -1,7 +1,7 @@
 upload_image_swift_image_name: '{{ build_diskimage_image_name | default(zuul.image_build_name) }}'
 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_filename: '{{ build_diskimage_image_root }}/{{ build_diskimage_image_name | default(zuul.image_build_name) }}.{{ upload_image_swift_extension }}'
+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