diff --git a/.github/scripts/sign-exe-in-zip-file.sh b/.github/scripts/sign-exe-in-zip-file.sh
index dca533d03..6dc5c7712 100755
--- a/.github/scripts/sign-exe-in-zip-file.sh
+++ b/.github/scripts/sign-exe-in-zip-file.sh
@@ -17,6 +17,8 @@ echo "Adding to zip contents of a folder ${destination_folder_name}"
 zip -r -q $file ./${destination_folder_name}
 echo "Successfully zipped ${destination_folder_name} into ${file}"
 java -jar ${workdir}/.github/scripts/self-extracting-jar-creator.jar $file
+echo "Remove temporary ${destination_folder_name}"
+rm -rf ./${destination_folder_name}
 
 echo "Creating checksums sha-256 and md5 for ${file}"
 shasum -a 256 $file > ${file}.sha256
diff --git a/.github/workflows/gh-hosted-eclipse-distro-build.yml b/.github/workflows/gh-hosted-eclipse-distro-build.yml
index 7e64bd8de..533f301d6 100644
--- a/.github/workflows/gh-hosted-eclipse-distro-build.yml
+++ b/.github/workflows/gh-hosted-eclipse-distro-build.yml
@@ -130,18 +130,19 @@ jobs:
           dist_path=`cat s3-dist-path.txt`
           
           echo "S3 contents:"
-          aws s3 ls s3://dist.springsource.com/${dist_path}/
+          aws s3 ls s3://dist.springsource.com/${dist_path}
           
           echo "Processing S3 update..."
           
           ls spring-tool-suite-4*win*.zip*
-          echo "Removing old win zip files from s3..."
-          aws s3 rm s3://dist.springsource.com/${dist_path}/ --exclude "*" --include "spring-tool-suite-4*win*.zip*"
-          echo "Uploading new win zip files to s3..."
-          aws s3 cp s3://dist.springsource.com/${dist_path}/ . --exclude "*" --include "spring-tool-suite-4*win*.zip*" --acl public-read
-          
           ls spring-tool-suite-4*win*.jar*
-          echo "Removing old self extractable win jar files from s3..."
-          aws s3 rm s3://dist.springsource.com/${dist_path}/ --exclude "*" --include "spring-tool-suite-4*win*.jar*"
-          echo "Uploading new self extractable win jar files to s3..."
-          aws s3 cp s3://dist.springsource.com/${dist_path}/ . --exclude "*" --include "spring-tool-suite-4*win*.jar*" --acl public-read
+          echo "Removing old win zip and self extracting jar files from s3..."
+          aws s3 rm s3://dist.springsource.com/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*win*.zip*" --include "spring-tool-suite-4*win*.self-extracting.jar*"
+          echo "Uploading new win zip and self extracting jar files to s3..."
+          aws s3 cp s3://dist.springsource.com/${dist_path} . --recursive --exclude "*" --include "spring-tool-suite-4*win*.zip*" --include "spring-tool-suite-4*win*.self-extracting.jar*" --acl public-read
+          
+#          ls spring-tool-suite-4*win*.jar*
+#          echo "Removing old self extractable win jar files from s3..."
+#          aws s3 rm s3://dist.springsource.com/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*win*.jar*"
+#          echo "Uploading new self extractable win jar files to s3..."
+#          aws s3 cp s3://dist.springsource.com/${dist_path} . --recursive --exclude "*" --include "spring-tool-suite-4*win*.jar*" --acl public-read
diff --git a/.github/workflows/self-hosted-eclipse-distro-build.yml b/.github/workflows/self-hosted-eclipse-distro-build.yml
index b05e920e5..b1e26572b 100644
--- a/.github/workflows/self-hosted-eclipse-distro-build.yml
+++ b/.github/workflows/self-hosted-eclipse-distro-build.yml
@@ -1,4 +1,4 @@
-name: Eclipse Distro STS Build
+name: Eclipse Distro STS Build (Self Hosted)
 
 on:
   workflow_call: