diff --git a/.github/scripts/update-distro-download-page.sh b/.github/scripts/update-distro-download-page.sh
index 9d3705033..9f50ff81e 100755
--- a/.github/scripts/update-distro-download-page.sh
+++ b/.github/scripts/update-distro-download-page.sh
@@ -30,7 +30,7 @@ rm -f ./${downloads_html}
 echo '<ul>' >> $downloads_html
 for file in $files
 do
-  if [[ "$file" =~ ^"s3://spring-tools-io" ]]; then
+  if [[ "$file" =~ ^"s3://tools-spring-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
diff --git a/.github/workflows/gen-nighly-downloads.yml b/.github/workflows/gen-nighly-downloads.yml
index ca56dfca7..720cb23cc 100644
--- a/.github/workflows/gen-nighly-downloads.yml
+++ b/.github/workflows/gen-nighly-downloads.yml
@@ -28,7 +28,7 @@ jobs:
           for file in $files
           do
             echo "entry: ${file}" 
-            if [[ "$file" =~ ^"s3://spring-tools-io" ]]; then
+            if [[ "$file" =~ ^"s3://tools-spring-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  
diff --git a/.github/workflows/gh-hosted-eclipse-distro-build.yml b/.github/workflows/gh-hosted-eclipse-distro-build.yml
index a844e7928..c03cf05cc 100644
--- a/.github/workflows/gh-hosted-eclipse-distro-build.yml
+++ b/.github/workflows/gh-hosted-eclipse-distro-build.yml
@@ -292,7 +292,7 @@ jobs:
           echo "Removing old dmg files from Akamai..."
           aws s3 rm s3://tools-spring-io/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*macosx*.dmg*" --exclude "*/*"
           echo "Uploading new dmg files to Akamai..."
-          aws s3 mv . s3://dist.springsource.com/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*macosx*.dmg*" --exclude "*/*" --no-progress
+          aws s3 mv . s3://tools-spring-io/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*macosx*.dmg*" --exclude "*/*" --no-progress
       - name: Update Nightly Distro Downloads page
         if: ${{ inputs.build_type == 'snapshot' && always() }}
         run: |