diff --git a/roles/copr/backend/files/copr-builder-image-prepare-os.sh b/roles/copr/backend/files/copr-builder-image-prepare-os.sh
index e2c24d4f2b..ce7df4efc9 100755
--- a/roles/copr/backend/files/copr-builder-image-prepare-os.sh
+++ b/roles/copr/backend/files/copr-builder-image-prepare-os.sh
@@ -1,21 +1,38 @@
 #! /bin/bash
 
-# Automatically create updated virtual machine in OpenStack so we can later
-# create a snapshot (builder image) from it.  See
+# Automatically create an updated virtual machine in OpenStack or AWS so we can
+# later create a snapshot (builder image) from it.  See
 # https://docs.pagure.org/copr.copr/how_to_upgrade_builders.html
 
 . /home/copr/cloud/keystonerc_proper_tenant
 
 set -e
 
-arch=$1
+parse_first_argument()
+{
+    old_IFS=$IFS
+    IFS=:
+    set -- $1
+    if test -z $2; then
+        # cloud not specified, default to openstack
+        cloud=os
+        arch=$1
+    else
+        cloud=$1
+        arch=$2
+    fi
+    IFS=$old_IFS
+}
+
+parse_first_argument "$1"
 
 die() { echo "$*" >&2 ; exit 1 ; }
 
-case $arch in
-    ppc64le) playbook=/home/copr/provision/builderpb_nova_ppc64le.yml ;;
-    x86_64)  playbook=/home/copr/provision/builderpb_nova.yml ;;
-    *) die "bad architecture '$arch'" ;;
+case $cloud:$arch in
+    os:ppc64le) playbook=/home/copr/provision/builderpb_nova_ppc64le.yml ;;
+    os:x86_64)  playbook=/home/copr/provision/builderpb_nova.yml ;;
+    aws:x86_64) playbook=/home/copr/provision/builderpb-aws-x86_64.yml ;;
+    *) die "bad cloud ($cloud) or architecture ($arch)" ;;
 esac
 
 logfile="/tmp/prepare-image-os-$arch.log"
@@ -34,6 +51,7 @@ fedora=$(ssh "root@$ip" 'rpm --eval %fedora')
 
 new_volume_name="copr-builder-$arch-f$fedora-$(date +"%Y%m%d_%H%M%S")"
 
+if test $cloud = os; then
 # we can not just do
 # $ nova-3 image-create "$vm_name" "$new_volume_name" --poll
 # because it throws error:
@@ -55,3 +73,30 @@ it "$new_volume_name".  Once snapshot is saved, run:
 And continue with
 https://docs.pagure.org/copr.copr/how_to_upgrade_builders.html#how-to-upgrade-builders
 EOF
+elif test $cloud = aws; then
+    instance_id=$(aws ec2 describe-instances \
+        --query "Reservations[].Instances[].InstanceId" \
+        --filter Name=tag-key,Values=Name,Name=tag-value,Values="$vm_name" \
+        --output text
+    )
+
+    # search results can be empty, and that would be error
+    test -n "$instance_id"
+
+    image_id=$(aws ec2 create-image \
+        --instance-id "$instance_id" \
+        --name "$new_volume_name" \
+        --output text
+    )
+
+    # This makes the web-UI nicer (first field of AMI list)
+    aws ec2 create-tags \
+        --resources "$image_id" \
+        --tags Key=Name,Value="$new_volume_name"
+
+    # This is required so fedora infra people won't delete the images
+    # automatically
+    aws ec2 create-tags \
+        --resources "$image_id" \
+        --tags Key=FedoraGroup,Value=copr
+fi
diff --git a/roles/copr/backend/tasks/aws.yml b/roles/copr/backend/tasks/aws.yml
index 96595d576c..df058cc495 100644
--- a/roles/copr/backend/tasks/aws.yml
+++ b/roles/copr/backend/tasks/aws.yml
@@ -20,3 +20,13 @@
   with_items:
   - { user: copr }
   - { user: resalloc }
+
+- name: install aws config file
+  template: src=aws-config
+            dest="/home/{{ item.user }}/.aws/config"
+            owner={{ item.user }}
+            group={{ item.user }}
+            mode=0600
+  with_items:
+  - { user: copr }
+  - { user: resalloc }
diff --git a/roles/copr/backend/templates/aws-config b/roles/copr/backend/templates/aws-config
new file mode 100644
index 0000000000..ee8f7ce735
--- /dev/null
+++ b/roles/copr/backend/templates/aws-config
@@ -0,0 +1,3 @@
+[default]
+region = us-east-1
+output = json