diff --git a/.github/scripts/build-vscode-extension.sh b/.github/scripts/build-vscode-extension.sh
index 58d43df39..24885ebf0 100755
--- a/.github/scripts/build-vscode-extension.sh
+++ b/.github/scripts/build-vscode-extension.sh
@@ -37,14 +37,11 @@ else
     npm run vsce-package
 fi
 
-echo "Finished Building"
-
 # for release build we don't add version-qualifier to package.json
 # So we must instead rename the file ourself to add a qualifier
 if [ "$dist_type" == release ]; then
     vsix_file=`ls *.vsix`
-    echo "Determining latest tag..."
-    echo "Current Folder: `pwd`"
+    git fetch --tags
 #    release_name=`git tag --points-at HEAD | grep ${extension_id}`
     release_name=`git tag | grep ${extension_id}`
     echo "release_name=$release_name"
diff --git a/.github/workflows/build-vscode-extension.yml b/.github/workflows/build-vscode-extension.yml
index 2a455e05e..dc247f60c 100644
--- a/.github/workflows/build-vscode-extension.yml
+++ b/.github/workflows/build-vscode-extension.yml
@@ -33,11 +33,6 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          echo `git version`
-          echo `git status`
-          git fetch --tags
-          git_tag=`git tag | grep ${{ inputs.extension-name }}`
-          echo "Git tag: '${git_tag}'"
           ${{ github.workspace }}/.github/scripts/build-vscode-extension.sh ${{ inputs.extension-name }} ${{ inputs.dist }}
           ls ./vsix
       - name: Cloudgate S3 Configuration
@@ -64,9 +59,9 @@ jobs:
           s3_path=vscode-extensions/${{ inputs.extension-name }}/$base_version/${dist}
           echo "S3 path: ${s3_path}"
           aws s3 rm s3://tools-spring-io/$s3_path/ --recursive
-          aws s3 cp ./vsix/$file s3://tools-spring-io/$s3_path/$file --no-progress
+          aws s3 cp ./vsix/$vsix_file s3://tools-spring-io/$s3_path/$vsix_file --no-progress
           echo "version=$base_version" >> $GITHUB_OUTPUT
-          echo "s3_url=https://cdn.spring.io/spring-tools/$s3_path/$file" >> $GITHUB_OUTPUT
+          echo "s3_url=https://cdn.spring.io/spring-tools/$s3_path/$vsix_file" >> $GITHUB_OUTPUT
       - id: tools-team-slack
         if: ${{ inputs.dist == 'release' }}
         uses: slackapi/slack-github-action@v1.26