diff --git a/.github/workflows/eclipse-distro-build.yml b/.github/workflows/eclipse-distro-build.yml
index 3d8001973..4944ee59c 100644
--- a/.github/workflows/eclipse-distro-build.yml
+++ b/.github/workflows/eclipse-distro-build.yml
@@ -27,6 +27,8 @@ jobs:
       - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
         with:
           ref: ${{ inputs.ref }}
+          sparse-checkout: |
+            eclipse-distribution
       - name: Set up JDK 17
         uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2
         with:
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 53b93bde8..965534ce2 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml
@@ -672,21 +672,6 @@
 						</goals>
 					</execution>
 
-					<execution>
-						<id>generate-s3-upload-info</id>
-						<phase>verify</phase>
-						<configuration>
-							<target>
-								<echo file="${project.build.directory}/s3-dist-path.txt">
-									${dist.path.product}
-								</echo>
-							</target>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-
 					<execution>
 						<id>upload-nightly-downloads</id>
 						<phase>deploy</phase>
@@ -696,11 +681,26 @@
 								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
 								<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
 
-                                <s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
-                                    <upload bucketName="${dist.bucket}" file="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html"
-    	                                toFile="snapshot/STS4/sts4-nightly-${dist.target.major}.html" publicRead="true">
-	                                </upload>
-                                </s3>
+								<s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
+									<upload bucketName="${dist.bucket}" file="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html"
+											toFile="snapshot/STS4/sts4-nightly-${dist.target.major}.html" publicRead="true">
+									</upload>
+								</s3>
+							</target>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+
+					<execution>
+						<id>generate-s3-upload-info</id>
+						<phase>verify</phase>
+						<configuration>
+							<target>
+								<echo file="${project.build.directory}/s3-dist-path.txt">
+									${dist.path.product}
+								</echo>
 							</target>
 						</configuration>
 						<goals>
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e429/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e429/pom.xml
index f0687f188..c496888a4 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e429/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e429/pom.xml
@@ -524,20 +524,64 @@
 								<property name="dmgName" value="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" />
 								<property name="dmgName-aarch64" value="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.aarch64.dmg" />
 
+								<exec executable="xcrun" failonerror="true">
+									<arg value="notarytool" />
+									<arg value="store-credentials" />
+									<arg value="notarize-app-dmg-profile" />
+									<arg value="--apple-id" />
+									<arg value="${env.AC_USERNAME}" />
+									<arg value="--team-id" />
+									<arg value="${env.APPLE_TEAM_ID}" />
+									<arg value="--password" />
+									<arg value="${env.AC_PASSWORD}" />
+								</exec>
+
 								<parallel failonany="true">
-
-									<exec executable="${project.build.directory}/../macos-notarize.sh" failonerror="true">
+									<exec executable="xcrun" failonerror="true">
+										<arg value="notarytool" />
+										<arg value="submit" />
 										<arg value="${dmgName}" />
-										<arg value="${env.MACOS_NOTARIZATION_SERVICE_URL}" />
+										<arg value="--keychain-profile" />
+										<arg value="notarize-app-dmg-profile" />
+										<arg value="--wait" />
 									</exec>
-
-									<exec executable="${project.build.directory}/../macos-notarize.sh" failonerror="true">
+									<exec executable="xcrun" failonerror="true">
+										<arg value="notarytool" />
+										<arg value="submit" />
 										<arg value="${dmgName-aarch64}" />
-										<arg value="${env.MACOS_NOTARIZATION_SERVICE_URL}" />
+										<arg value="--keychain-profile" />
+										<arg value="notarize-app-dmg-profile" />
+										<arg value="--wait" />
 									</exec>
-
 								</parallel>
 
+								<parallel failonany="true">
+									<exec executable="xcrun" failonerror="true">
+										<arg value="stapler" />
+										<arg value="staple" />
+										<arg value="${dmgName}" />
+									</exec>
+									<exec executable="xcrun" failonerror="true">
+										<arg value="stapler" />
+										<arg value="staple" />
+										<arg value="${dmgName-aarch64}" />
+									</exec>
+								</parallel>
+
+<!--								<parallel failonany="true">-->
+
+<!--									<exec executable="${project.build.directory}/../macos-notarize.sh" failonerror="true">-->
+<!--										<arg value="${dmgName}" />-->
+<!--										<arg value="${env.MACOS_NOTARIZATION_SERVICE_URL}" />-->
+<!--									</exec>-->
+
+<!--									<exec executable="${project.build.directory}/../macos-notarize.sh" failonerror="true">-->
+<!--										<arg value="${dmgName-aarch64}" />-->
+<!--										<arg value="${env.MACOS_NOTARIZATION_SERVICE_URL}" />-->
+<!--									</exec>-->
+
+<!--								</parallel>-->
+
 							</target>
 						</configuration>
 						<goals>
@@ -619,7 +663,7 @@
 
 					<execution>
 						<id>update-nightly-downloads</id>
-						<phase>deploy</phase>
+						<phase>verify</phase>
 						<configuration>
 							<skip>${skip.update-nightly-download-page}</skip>
 							<target>
@@ -627,14 +671,30 @@
 								<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
 
 								<copy file="${project.build.directory}/../../common/html/nightly-generic-snippet-incl-apple-m1.html" tofile="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html" overwrite="true"/>
-		
+
 								<replace file="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html" token="@QUALIFIER@" value="${unqualifiedVersion}.${p2.qualifier}" summary="yes" />
 								<replace file="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html" token="@TARGET@" value="${dist.target}" summary="yes" />
 								<replace file="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html" token="@MAJOR-TARGET@" value="${dist.target.major}" summary="yes" />
 
+							</target>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+
+					<execution>
+						<id>upload-nightly-downloads</id>
+						<phase>deploy</phase>
+						<configuration>
+							<skip>${skip.update-nightly-download-page}</skip>
+							<target>
+								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
+								<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
+
 								<s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
 									<upload bucketName="${dist.bucket}" file="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html"
-										toFile="snapshot/STS4/sts4-nightly-${dist.target.major}.html" publicRead="true">
+											toFile="snapshot/STS4/sts4-nightly-${dist.target.major}.html" publicRead="true">
 									</upload>
 								</s3>
 							</target>
@@ -644,6 +704,21 @@
 						</goals>
 					</execution>
 
+					<execution>
+						<id>generate-s3-upload-info</id>
+						<phase>verify</phase>
+						<configuration>
+							<target>
+								<echo file="${project.build.directory}/s3-dist-path.txt">
+									${dist.path.product}
+								</echo>
+							</target>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+
 					<execution>
 						<id>zip-sts-repository</id>
 						<phase>install</phase>