diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml
index 4dc54c55a..430eec1b8 100644
--- a/eclipse-distribution/pom.xml
+++ b/eclipse-distribution/pom.xml
@@ -88,8 +88,8 @@
 
 		<dist.bucket>dist.springsource.com</dist.bucket>
 		<dist.key>TOOLS</dist.key>
-		<dist.accessKey>${env.bamboo.tools.s3.accesskey.password}</dist.accessKey>
-		<dist.secretKey>${env.bamboo.tools.s3.secretkey.password}</dist.secretKey>
+		<dist.accessKey>${env.bamboo_tools_s3_accesskey_password}</dist.accessKey>
+		<dist.secretKey>${env.bamboo_tools_s3_secretkey_password}</dist.secretKey>
 
 		<dist.project>sts4</dist.project>
 
diff --git a/eclipse-language-servers/pom.xml b/eclipse-language-servers/pom.xml
index 896ca2e48..8a1d42885 100644
--- a/eclipse-language-servers/pom.xml
+++ b/eclipse-language-servers/pom.xml
@@ -90,8 +90,8 @@
 		<tycho-version>1.7.0</tycho-version>
 		<encoding>UTF-8</encoding>
 
-		<dist.accessKey>${env.bamboo.tools.s3.accesskey.password}</dist.accessKey>
-		<dist.secretKey>${env.bamboo.tools.s3.secretkey.password}</dist.secretKey>
+		<dist.accessKey>${env.bamboo_tools_s3_accesskey_password}</dist.accessKey>
+		<dist.secretKey>${env.bamboo_tools_s3_secretkey_password}</dist.secretKey>
 
 		<dist.bucket>dist.springsource.com</dist.bucket>
 		<dist.key>TOOLS</dist.key>