diff --git a/steps/assets/ignition-bootstrap.tf b/steps/assets/ignition-bootstrap.tf
index 321110e972..d8a26ee1ae 100644
--- a/steps/assets/ignition-bootstrap.tf
+++ b/steps/assets/ignition-bootstrap.tf
@@ -88,7 +88,7 @@ data "template_file" "rm_assets" {
   vars {
     cluster_name       = "${var.tectonic_cluster_name}"
     awscli_image       = "${var.tectonic_container_images["awscli"]}"
-    assets_s3_location = "${local.bucket_name}/${local.bucket_assets_key}"
+    bucket_s3_location = "${local.bucket_name}"
   }
 }
 
diff --git a/steps/assets/resources/rm-assets.sh b/steps/assets/resources/rm-assets.sh
index 01d2ec4a21..072207017d 100644
--- a/steps/assets/resources/rm-assets.sh
+++ b/steps/assets/resources/rm-assets.sh
@@ -11,14 +11,15 @@ s3_clean() {
     /usr/bin/docker run \
         --volume /tmp:/tmp \
         --network=host \
-        --env LOCATION="${assets_s3_location}" \
+        --env LOCATION="${bucket_s3_location}" \
         --entrypoint=/bin/bash \
         ${awscli_image} \
         -c '
             set -e
             set -o pipefail
             REGION=$(wget -q -O - http://169.254.169.254/latest/meta-data/placement/availability-zone | sed '"'"'s/[a-zA-Z]$//'"'"')
-            /usr/bin/aws --region="$REGION" s3 cp /tmp/assets.zip s3://"$LOCATION"
+            /usr/bin/aws --region="$REGION" s3 cp /tmp/assets.zip s3://"$LOCATION/assets.zip"
+            /usr/bin/aws --region="$REGION" s3 cp /tmp/assets.zip s3://"$LOCATION/ignition"
         '
 }