diff --git a/.github/workflows/upload-nightly-downloads-page.yml b/.github/workflows/upload-nightly-downloads-page.yml
index e9ad3048b..4dee2482e 100644
--- a/.github/workflows/upload-nightly-downloads-page.yml
+++ b/.github/workflows/upload-nightly-downloads-page.yml
@@ -32,9 +32,9 @@ jobs:
       - name: Upload nightly-distributions.html
         run: |
           echo "Removing old nightly-distributions.html from s3..."
-          aws s3 rm s3://dist.springsource.com/snapshot/STS4/nightly-distributions.html
+          aws s3 rm s3://tools-spring-io/snapshot/STS4/nightly-distributions.html
           echo "Uploading new nightly-distributions.html to s3..."
-          aws s3 cp ./eclipse-distribution/common/html/nightly-distributions.html s3://dist.springsource.com/snapshot/STS4/nightly-distributions.html --acl public-read --no-progress
+          aws s3 cp ./eclipse-distribution/common/html/nightly-distributions.html s3://tools-spring-io/snapshot/STS4/nightly-distributions.html --no-progress
       - name: Invalidate S3 Cloudfront Cache
         env:
           CLOUDFLARE_ZONE_ID: ${{ secrets.CLOUDFLARE_ZONE_ID }}
diff --git a/eclipse-distribution/common/html/nightly-distributions.html b/eclipse-distribution/common/html/nightly-distributions.html
index 8e39786fc..66991f0b7 100644
--- a/eclipse-distribution/common/html/nightly-distributions.html
+++ b/eclipse-distribution/common/html/nightly-distributions.html
@@ -23,9 +23,9 @@
 
 	<p><b>STS4 Distribution:</b>
 		<ul>
-			<li>for Eclipse 2023-12 (4.30): <a href="https://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.30">https://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.30</a></li>
-			<li>for Eclipse 2023-09 (4.29): <a href="https://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.29">https://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.29</a></li>
-			<li>for Eclipse 2023-06 (4.28): <a href="https://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.28">https://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.28</a></li>
+			<li>for Eclipse 2023-12 (4.30): <a href="https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts4/nightly/e4.30">https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts4/nightly/e4.30</a></li>
+			<li>for Eclipse 2023-09 (4.29): <a href="https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts4/nightly/e4.29">https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts4/nightly/e4.29</a></li>
+			<li>for Eclipse 2023-06 (4.28): <a href="https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts4/nightly/e4.28">https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts4/nightly/e4.28</a></li>
 		</ul>
 	</p>
 		
@@ -34,7 +34,7 @@
 
 	<p>
 		<ul>
-			<li><a href="https://dist.springsource.com/snapshot/TOOLS/sts4-language-server-integrations/nightly">https://dist.springsource.com/snapshot/TOOLS/sts4-language-server-integrations/nightly</a></li>
+			<li><a href="https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts4-language-server-integrations/nightly">https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts4-language-server-integrations/nightly</a></li>
 		</ul>
 	</p>