diff --git a/.github/scripts/update-distro-download-page.sh b/.github/scripts/update-distro-download-page.sh
index 67da50d19..a7edadd71 100755
--- a/.github/scripts/update-distro-download-page.sh
+++ b/.github/scripts/update-distro-download-page.sh
@@ -2,6 +2,7 @@ dist_path=$1
 eclipse_version=$2
 build_type=$3
 
+# Legacy S3 tool-spring-io dist.springsource.com
 s3_url=s3://dist.springsource.com/${dist_path}
 downloads_html="sts4-nightly-${eclipse_version}.html"
 files=`aws s3 cp ${s3_url} . --recursive --exclude "*" --include "spring-tool-suite-4*.zip" --include "spring-tool-suite-4*.dmg" --include "spring-tool-suite-4*.self-extracting.jar" --include "spring-tool-suite-4*.tar.gz" --exclude "*/*" --dryrun`
@@ -17,5 +18,22 @@ do
 done
 echo '</ul>' >> $downloads_html
 cat ./$downloads_html
-aws s3 cp ./$downloads_html s3://dist.springsource.com/${build_type}/STS4/ --acl public-read --no-progress
+aws s3 mv ./$downloads_html s3://dist.springsource.com/${build_type}/STS4/ --acl public-read --no-progress
+
+# Akamai tools-spring-io bucket
+s3_url=s3://spring-tools-io/${dist_path}
+downloads_html="sts4-nightly-${eclipse_version}.html"
+files=`aws s3 cp ${s3_url} . --recursive --exclude "*" --include "spring-tool-suite-4*.zip" --include "spring-tool-suite-4*.dmg" --include "spring-tool-suite-4*.self-extracting.jar" --include "spring-tool-suite-4*.tar.gz" --exclude "*/*" --dryrun`
+rm -f ./${downloads_html}
+echo '<ul>' >> $downloads_html
+for file in $files
+do
+  if [[ "$file" =~ ^"s3://spring-tools-io" ]]; then
+    download_url=https://cdn.spring.io/spring-tools${file:20} #
+    filename=${file:${#s3_url}+1}
+    echo '  <li><a href="'${download_url}'">'${filename}'</li>' >> $downloads_html
+  fi
+done
+echo '</ul>' >> $downloads_html
+cat ./$downloads_html
 aws s3 mv ./$downloads_html s3://tools-spring-io/${build_type}/STS4/ --no-progress
diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml
index fef91c047..b6cc9edc3 100644
--- a/concourse/pipeline.yml
+++ b/concourse/pipeline.yml
@@ -294,9 +294,8 @@ resources:
     driver: s3
     bucket: ((s3_bucket))
     key: versions/vscode-extensions
-    access_key_id: ((s3_svc_accesskey))
-    secret_access_key: ((s3_svc_secretkey))
-    aws_role_arn: arn:aws:iam::((s3_svc_account_id)):role/((s3_svc_user))
+    access_key_id: ((s3_accesskey))
+    secret_access_key: ((s3_secretkey))
     region_name: ((s3_region))
     initial_version: 0.0.5-RC.6
 - name: nightly