diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e417/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e417/pom.xml
index 002982767..13ad255c7 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e417/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e417/pom.xml
@@ -14,11 +14,6 @@
 
 	<packaging>eclipse-repository</packaging>
 
-	<properties>
-		<dist.accessKey>${accessKey}</dist.accessKey>
-		<dist.secretKey>${secretKey}</dist.secretKey>
-	</properties>
-
 	<build>
 		<plugins>
 
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e418/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e418/pom.xml
index 002982767..13ad255c7 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e418/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e418/pom.xml
@@ -14,11 +14,6 @@
 
 	<packaging>eclipse-repository</packaging>
 
-	<properties>
-		<dist.accessKey>${accessKey}</dist.accessKey>
-		<dist.secretKey>${secretKey}</dist.secretKey>
-	</properties>
-
 	<build>
 		<plugins>
 
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e419/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e419/pom.xml
index 002982767..13ad255c7 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e419/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e419/pom.xml
@@ -14,11 +14,6 @@
 
 	<packaging>eclipse-repository</packaging>
 
-	<properties>
-		<dist.accessKey>${accessKey}</dist.accessKey>
-		<dist.secretKey>${secretKey}</dist.secretKey>
-	</properties>
-
 	<build>
 		<plugins>
 
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e420/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e420/pom.xml
index 8eeea4e10..69a3074c9 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e420/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e420/pom.xml
@@ -15,8 +15,6 @@
 	<packaging>eclipse-repository</packaging>
 
 	<properties>
-		<dist.accessKey>${accessKey}</dist.accessKey>
-		<dist.secretKey>${secretKey}</dist.secretKey>
 		<justj.repository>https://download.eclipse.org/justj/jres/16/updates/release/latest/</justj.repository>
 	</properties>
 
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e421/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e421/pom.xml
index 236bd9718..e170aad01 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e421/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e421/pom.xml
@@ -15,8 +15,6 @@
 	<packaging>eclipse-repository</packaging>
 
 	<properties>
-		<dist.accessKey>${accessKey}</dist.accessKey>
-		<dist.secretKey>${secretKey}</dist.secretKey>
 		<justj.repository>https://download.eclipse.org/justj/jres/17/updates/release/latest/</justj.repository>
 	</properties>
 
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e422/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e422/pom.xml
index cd4ced746..0d786d514 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e422/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e422/pom.xml
@@ -15,8 +15,6 @@
 	<packaging>eclipse-repository</packaging>
 
 	<properties>
-		<dist.accessKey>${accessKey}</dist.accessKey>
-		<dist.secretKey>${secretKey}</dist.secretKey>
 		<justj.repository>https://download.eclipse.org/justj/jres/17/updates/release/latest/</justj.repository>
 	</properties>
 
diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml
index f08028c44..b8fdebd24 100644
--- a/eclipse-distribution/pom.xml
+++ b/eclipse-distribution/pom.xml
@@ -88,6 +88,9 @@
 
 		<dist.bucket>dist.springsource.com</dist.bucket>
 		<dist.key>TOOLS</dist.key>
+		<dist.accessKey>${tools.s3.accesskey.password}</dist.accessKey>
+		<dist.secretKey>${tools.s3.secretkey.password}</dist.secretKey>
+
 		<dist.project>sts4</dist.project>
 
 		<dist.pathpostfix>nightly</dist.pathpostfix>
diff --git a/eclipse-language-servers/pom.xml b/eclipse-language-servers/pom.xml
index 5b8c37f65..2360afe02 100644
--- a/eclipse-language-servers/pom.xml
+++ b/eclipse-language-servers/pom.xml
@@ -90,8 +90,9 @@
 		<tycho-version>1.7.0</tycho-version>
 		<encoding>UTF-8</encoding>
 
-		<dist.accessKey>${accessKey}</dist.accessKey>
-		<dist.secretKey>${secretKey}</dist.secretKey>
+		<dist.accessKey>${tools.s3.accesskey.password}</dist.accessKey>
+		<dist.secretKey>${tools.s3.secretkey.password}</dist.secretKey>
+
 		<dist.bucket>dist.springsource.com</dist.bucket>
 		<dist.key>TOOLS</dist.key>
 		<dist.path>${dist.type}/${dist.key}/${dist.project}/${dist.version}</dist.path>