diff --git a/roles/copr/backend/files/copr-builder-image-prepare-cloud.sh b/roles/copr/backend/files/copr-builder-image-prepare-cloud.sh
index ba53c0cfc3..f627e52a20 100755
--- a/roles/copr/backend/files/copr-builder-image-prepare-cloud.sh
+++ b/roles/copr/backend/files/copr-builder-image-prepare-cloud.sh
@@ -24,9 +24,28 @@ parse_first_argument()
     IFS=$old_IFS
 }
 
+help_output()
+{
+    cat >&2 <<EOF
+Usage: $0 CLOUD:ARCH [IMAGE]
+
+Prepare image for spawning copr builder VM.
+
+Valid values for CLOUD are 'os' (OpenStack) or 'aws' (Amazon Web Services).
+ARCH can be 'x86_64|aarch64' for CLOUD=aws, or 'x86_64|ppc64le' for CLOUD=os.
+
+By default, each CLOUD:ARCH pair has it's own default image ID preconfigured,
+and we spinup the VM from that image.  This can be overwritten by IMAGE
+argument, e.g. when migrating from Fedora N to Fedora N+1.
+EOF
+}
+
+die() { echo "$*" >&2; echo >&2; help_output; exit 1; }
+
+test -n "$1" || die "No CLOUD:ARCH specified."
+
 parse_first_argument "$1"
 
-die() { echo "$*" >&2 ; exit 1 ; }
 
 case $cloud:$arch in
     os:ppc64le) playbook=/home/copr/provision/builderpb_nova_ppc64le.yml ;;
@@ -100,4 +119,7 @@ elif test $cloud = aws; then
     aws ec2 create-tags \
         --resources "$image_id" \
         --tags Key=FedoraGroup,Value=copr
+
+    echo >&2 "The new image ID   is: $image_id"
+    echo >&2 "The new image Name is: $new_volume_name"
 fi
diff --git a/roles/copr/backend/files/provision/builderpb-aws-aarch64.yml b/roles/copr/backend/files/provision/builderpb-aws-aarch64.yml
index 3603852be3..83c8ae2bf4 100644
--- a/roles/copr/backend/files/provision/builderpb-aws-aarch64.yml
+++ b/roles/copr/backend/files/provision/builderpb-aws-aarch64.yml
@@ -16,6 +16,7 @@
     max_spawn_time: 1100
     spawning_vm_user: "fedora"
     arch: aarch64
+    image_name: "{{ builder_images[arch] }}"
     instance_volumes:
       - device_name: sdb
         delete_on_termination: True
diff --git a/roles/copr/backend/files/provision/builderpb-aws-x86_64.yml b/roles/copr/backend/files/provision/builderpb-aws-x86_64.yml
index ba0ff8f12f..fc6ff22513 100644
--- a/roles/copr/backend/files/provision/builderpb-aws-x86_64.yml
+++ b/roles/copr/backend/files/provision/builderpb-aws-x86_64.yml
@@ -16,6 +16,7 @@
     max_spawn_time: 1100
     spawning_vm_user: "fedora"
     arch: x86_64
+    image_name: "{{ builder_images[arch] }}"
 
   tasks:
   - include: "spinup_aws_task.yml"