diff --git a/.github/scripts/akamai-aws-cli-env.sh b/.github/scripts/akamai-aws-cli-env.sh
index 4a461a3b6..17cf96c7b 100755
--- a/.github/scripts/akamai-aws-cli-env.sh
+++ b/.github/scripts/akamai-aws-cli-env.sh
@@ -2,7 +2,11 @@
 # The script asks for temp credentials to be able to upload to Akamai S3 origin bucket
 # The AWS CLI environment variables are then updated with temp credentials values
 session_name=$1
-duration_seconds=$2
+duration_seconds=900
+if [ ! -z "$2" ]; then
+  duration_seconds=$2
+fi
+
 export $(printf "AWS_ACCESS_KEY_ID=%s AWS_SECRET_ACCESS_KEY=%s AWS_SESSION_TOKEN=%s" \
 $(aws sts assume-role \
 --role-arn arn:aws:iam::${{ secrets.TOOLS_CLOUDGATE_ACCOUNT_ID }}:role/${{ secrets.TOOLS_CLOUDGATE_USER }} \
diff --git a/.github/workflows/eclipse-ls-extensions-build.yml b/.github/workflows/eclipse-ls-extensions-build.yml
index f794bce39..6642b490b 100644
--- a/.github/workflows/eclipse-ls-extensions-build.yml
+++ b/.github/workflows/eclipse-ls-extensions-build.yml
@@ -61,10 +61,20 @@ jobs:
         run: |
           echo "${{ secrets.GPG_PRIVATE_KEY }}" > gpg.asc
           echo "${{ secrets.GPG_PASSPHRASE }}" | gpg --batch --yes --passphrase-fd 0 --import gpg.asc
+      - name: Akamai Setup
+        id: akamai-setup
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.TOOLS_CLOUDGATE_ACCESS_KEY }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.TOOLS_CLOUDGATE_SECRET_KEY  }}
+          AWS_DEFAULT_REGION: us-east-1
+        run: |
+          ${{ github.workspace }}/.github/scripts/akamai-aws-cli-env.sh ${{ github.run }} 
+          echo "AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID" >> $GITHUB_ENV
+          echo "AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY" >> $GITHUB_ENV
+          echo "AWS_SESSION_TOKEN=$AWS_SESSION_TOKEN" >> $GITHUB_ENV
+          echo "AWS_DEFAULT_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV
       - name: Build Eclipse LS extensions
         env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.TOOLS_S3_ACCESS_KEY }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.TOOLS_S3_SECRET_KEY  }}
           gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
           gpg_keyname: ${{ secrets.GPG_KEYID }}
         run: |
@@ -82,9 +92,6 @@ jobs:
       - name: Clear S3 Caches
         if: ${{ inputs.build_type != 'snapshot' }}
         env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.TOOLS_S3_ACCESS_KEY }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.TOOLS_S3_SECRET_KEY  }}
-          AWS_DEFAULT_REGION: us-east-1
           CLOUDFLARE_ZONE_ID: ${{ secrets.CLOUDFLARE_ZONE_ID }}
           CLOUDFLARE_CACHE_TOKEN: ${{ secrets.CLOUDFLARE_CACHE_TOKEN }}
         run: |
diff --git a/eclipse-language-servers/pom.xml b/eclipse-language-servers/pom.xml
index 873fb964f..55bafbc8c 100644
--- a/eclipse-language-servers/pom.xml
+++ b/eclipse-language-servers/pom.xml
@@ -93,7 +93,7 @@
 		<dist.accessKey>${env.AWS_ACCESS_KEY_ID}</dist.accessKey>
 		<dist.secretKey>${env.AWS_SECRET_ACCESS_KEY}</dist.secretKey>
 
-		<dist.bucket>dist.springsource.com</dist.bucket>
+		<dist.bucket>tools-spring-io</dist.bucket>
 		<dist.key>TOOLS</dist.key>
 		<dist.path>${dist.type}/${dist.key}/${dist.project}/${dist.version}</dist.path>