diff --git a/.github/scripts/sign-notarize-osx-distro-file.sh b/.github/scripts/sign-notarize-osx-distro-file.sh
index ce678e183..b0df9066d 100644
--- a/.github/scripts/sign-notarize-osx-distro-file.sh
+++ b/.github/scripts/sign-notarize-osx-distro-file.sh
@@ -41,8 +41,8 @@ echo "Sign $dmg_filename"
 codesign --verbose --deep --force --timestamp --keychain $KEYCHAIN -s $MACOS_CERTIFICATE_ID $dmg_filename
 
 echo "Notarizing $dmg_filename"
-xcrun notarytool submit ${dmg_filename} --keychain-profile notarize-app-dmg-profile --wait &
-
-#echo "Creating checksums sha-256 and md5 for ${file}"
-#shasum -a 256 $filename > ${filename}.sha256
-#md5 $filename > ${filename}.md5
+(xcrun notarytool submit ${dmg_filename} --keychain-profile notarize-app-dmg-profile --wait \
+&& echo "Staple and generate checksums" \
+&& xcrun stapler staple $dmg_filename \
+&& shasum -a 256 $dmg_filename > ${dmg_filename}.sha256 \
+&& md5 $dmg_filename > ${dmg_filename}.md5) &
\ No newline at end of file
diff --git a/.github/workflows/gh-hosted-eclipse-distro-build.yml b/.github/workflows/gh-hosted-eclipse-distro-build.yml
index f5c97d17f..3791f0a9b 100644
--- a/.github/workflows/gh-hosted-eclipse-distro-build.yml
+++ b/.github/workflows/gh-hosted-eclipse-distro-build.yml
@@ -88,7 +88,7 @@ jobs:
           AWS_ACCESS_KEY_ID: ${{ secrets.TOOLS_S3_ACCESS_KEY }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.TOOLS_S3_SECRET_KEY  }}
         run: |
-          echo "Uploading Win Zips to S3 for signing..."
+          echo "Uploading Win Zips and OSX tar.gz to S3 for signing..."
           aws s3 cp ${{ github.workspace }}/eclipse-distribution/org.springframework.boot.ide.product.${{ inputs.eclipse_profile }}/target/products s3://dist.springsource.com/sts4-distro-ci-temp/${{ github.run_id }} --recursive --exclude "*" --include "spring-tool-suite-4*win*.zip" --include "spring-tool-suite-4*macosx*.tar.gz" --exclude "*/*" --no-progress
       - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce
         with:
@@ -192,7 +192,23 @@ jobs:
             ${{ github.workspace }}/.github/scripts/sign-notarize-osx-distro-file.sh $file ${{ github.workspace }}/.github/assets/entitlements.plist ${{ github.workspace }}/.github/assets/sts4.icns
           done
           wait
-          echo "Done sign and notarization"
+          echo "Done signing and notarization of DMG files"
+      - uses: actions/download-artifact@cbed621e49e4c01b044d60f6c80ea4ed6328b281
+        with:
+          name: s3-dist-path-${{ github.run_id }}.${{ github.run_attempt }}
+      - name: Update Win zip/jar on S3
+        id: update-s3
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.TOOLS_S3_ACCESS_KEY }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.TOOLS_S3_SECRET_KEY  }}
+        run: |
+          dist_path=`cat s3-dist-path.txt`
+          echo "Processing S3 update..."
+          ls spring-tool-suite-4*macosx*.dmg*
+          echo "Removing old dmg files from s3..."
+          aws s3 rm s3://dist.springsource.com/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*macosx*.dmg*" --exclude "*/*"
+          echo "Uploading new dmg files to s3..."
+          aws s3 mv . s3://dist.springsource.com/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*macosx*.dmg*" --exclude "*/*" --acl public-read --no-progress
 
   cleanup:
     needs: [ sign-win-distros, sign-osx-distros ]
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml
index bc17247e8..fa8c8fdb1 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml
@@ -384,14 +384,14 @@
 									<arg value="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg"/>
 								</exec>
 
-								<delete file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.tar.gz"/>
+								<!--<delete file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.tar.gz"/>-->
 								
 								<exec executable="/usr/local/bin/appdmg" failonerror="true">
 									<arg value="${project.build.directory}/../spring-tool-suite-4-dmg-config-${dist.target.major}-aarch64.json"/>
 									<arg value="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.aarch64.dmg"/>
 								</exec>
 
-								<delete file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.aarch64.tar.gz"/>
+								<!--<delete file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.aarch64.tar.gz"/>-->
 								
 							</target>
 						</configuration>
@@ -542,10 +542,10 @@
 
 									<delete bucketName="${dist.bucket}">
 										<fileset dir="${dist.path.product}">
-											<include name="spring-tool-suite-4*.tar.gz" />
-											<include name="spring-tool-suite-4*.tar.gz.md5" />
-											<include name="spring-tool-suite-4*.tar.gz.sha1" />
-											<include name="spring-tool-suite-4*.tar.gz.sha256" />
+											<include name="spring-tool-suite-4*linux*.tar.gz" />
+											<include name="spring-tool-suite-4*linux*.tar.gz.md5" />
+											<include name="spring-tool-suite-4*linux*.tar.gz.sha1" />
+											<include name="spring-tool-suite-4*linux*.tar.gz.sha256" />
 											<include name="spring-tool-suite-4*.dmg" />
 											<include name="spring-tool-suite-4*.dmg.md5" />
 											<include name="spring-tool-suite-4*.dmg.sha1" />