diff --git a/tf-a-builder/upload-tfa-next-artifacts.sh b/tf-a-builder/upload-tfa-next-artifacts.sh
index 65c3dba..93f0ed3 100755
--- a/tf-a-builder/upload-tfa-next-artifacts.sh
+++ b/tf-a-builder/upload-tfa-next-artifacts.sh
@@ -7,6 +7,6 @@
 # Use tpcli and the "upload" URL to upload these artifacts to the S3 bucket.
 # tpcli seems to only accept files that are in the current directory, therefore cd into artefacts-lava.
 cd ${WORKSPACE}/artefacts-lava
-/home/buildslave/.local/bin/tpcli -t ${TUXPUT_ARCHIVE_TOKEN} -b trustedfirmware-prod-storage "$URL_FIP" fip.bin
-/home/buildslave/.local/bin/tpcli -t ${TUXPUT_ARCHIVE_TOKEN} -b trustedfirmware-prod-storage "$URL_BL1" bl1.bin
+/home/buildslave/.local/bin/tpcli -t ${TUXPUT_ARCHIVE_TOKEN} -b ${TUXPUB_S3_BUCKET} "$URL_FIP" fip.bin
+/home/buildslave/.local/bin/tpcli -t ${TUXPUT_ARCHIVE_TOKEN} -b ${TUXPUB_S3_BUCKET} "$URL_BL1" bl1.bin
 cd -
diff --git a/tf-a-cleanup-tfa-next.yaml b/tf-a-cleanup-tfa-next.yaml
index 7bc8658..a840af4 100644
--- a/tf-a-cleanup-tfa-next.yaml
+++ b/tf-a-cleanup-tfa-next.yaml
@@ -25,12 +25,8 @@
                 sudo ./aws/install
             fi
 
-            aws configure list
-            ECR=987685672616.dkr.ecr.us-east-1.amazonaws.com
-            aws ecr get-login-password --region us-east-1|docker login --username AWS --password-stdin $ECR
-
             # All tfa-next related files should be under "artifacts" on the S3 bucket.
-            ROOT=s3://trustedfirmware-prod-storage/
+            ROOT=s3://${TUXPUB_S3_BUCKET}/
             for OBJECT in $(aws s3 ls $ROOT --recursive | grep artifacts | awk '{print $4}');
             do
                 echo "Current object: ${ROOT}${OBJECT}"