diff --git a/.github/workflows/eclipse-distro-build.yml b/.github/workflows/eclipse-distro-build.yml
index d59378f29..0049f9a15 100644
--- a/.github/workflows/eclipse-distro-build.yml
+++ b/.github/workflows/eclipse-distro-build.yml
@@ -54,6 +54,9 @@ jobs:
           MACOS_CERTIFICATE_ID: ${{ secrets.MACOS_CERTIFICATE_ID }}
           KEYCHAIN: /Users/runner/Library/Keychains/login.keychain-db
           MACOS_NOTARIZATION_SERVICE_URL: http://localhost:8080
+          AC_USERNAME: ${{ secrets.AC_USERNAME }}
+          AC_PASSWORD: ${{ secrets.AC_PASSWORD }}
+          APPLE_TEAM_ID: {{ secrets.APPLE_TEAM_ID }}
         run: |
           cd eclipse-distribution
           ./mvnw --batch-mode -U clean deploy -P${{ inputs.eclipse_profile }} -P${{ inputs.build_type }} -Pgitactions -Pgpg.sign -Dsigning.skip=true -Dmaven.repo.local=~/.m2/repository-signed -Dhttpclient.retry-max=20 -Dmaven.test.skip=true -Declipse.p2.mirrors=false -Dtycho.localArtifacts=ignore -Ds3service.https-only=true -Dp2.replaceQualifier=true -Dorg.eclipse.ecf.provider.filetransfer.httpclient.retrieve.readTimeout=1200000 -Dorg.eclipse.equinox.p2.transport.ecf.retry=5 -Dskip.eclipserun.proxies=false -Dskip.osx.signing=false  -Dskip.win.signing=false -Dskip.osx.notarizing=false -Dtycho.equinox.resolver.uses=true
\ No newline at end of file
diff --git a/.github/workflows/eclipse-ls-extensions-build.yml b/.github/workflows/eclipse-ls-extensions-build.yml
index 2b95ea112..7a62a5180 100644
--- a/.github/workflows/eclipse-ls-extensions-build.yml
+++ b/.github/workflows/eclipse-ls-extensions-build.yml
@@ -1,12 +1,12 @@
 name: Eclipse LS Extensions Snapshot Build
 
 # configure manual trigger
-#on:
-#  workflow_dispatch:
 on:
-  push:
-    branches:
-      - 'main'
+  workflow_dispatch:
+#on:
+#  push:
+#    branches:
+#      - 'main'
 
 jobs:
 
diff --git a/.github/workflows/experimental-eclipse-distro-build.yml b/.github/workflows/experimental-eclipse-distro-build.yml
index 7b950e47c..6c63ae11d 100644
--- a/.github/workflows/experimental-eclipse-distro-build.yml
+++ b/.github/workflows/experimental-eclipse-distro-build.yml
@@ -73,6 +73,9 @@ jobs:
           gpg_keyname: ${{ secrets.GPG_KEYID }}
           MACOS_CERTIFICATE_ID: ${{ secrets.MACOS_CERTIFICATE_ID }}
           MACOS_NOTARIZATION_SERVICE_URL: http://localhost:8080
+          AC_USERNAME: ${{ secrets.AC_USERNAME }}
+          AC_PASSWORD: ${{ secrets.AC_PASSWORD }}
+          APPLE_TEAM_ID: {{ secrets.APPLE_TEAM_ID }}
         run: |
           cd eclipse-distribution
           KEYCHAIN=$RUNNER_TEMP/app-signing.keychain-db
diff --git a/.github/workflows/snapshot-e427-eclipse-distro-build.yml b/.github/workflows/snapshot-e427-eclipse-distro-build.yml
index 54ac7ff55..bc4594ca7 100644
--- a/.github/workflows/snapshot-e427-eclipse-distro-build.yml
+++ b/.github/workflows/snapshot-e427-eclipse-distro-build.yml
@@ -7,6 +7,7 @@ concurrency:
 #on:
 #  workflow_dispatch:
 on:
+  workflow_dispatch:
   workflow_run:
     workflows: ["Eclipse LS Extensions Snapshot Build"]
     types: [completed]
diff --git a/.github/workflows/snapshot-e428-eclipse-distro-build.yml b/.github/workflows/snapshot-e428-eclipse-distro-build.yml
index 5ee1c12fc..9dbd66750 100644
--- a/.github/workflows/snapshot-e428-eclipse-distro-build.yml
+++ b/.github/workflows/snapshot-e428-eclipse-distro-build.yml
@@ -7,6 +7,7 @@ concurrency:
 #on:
 #  workflow_dispatch:
 on:
+  workflow_dispatch:
   workflow_run:
     workflows: ["Eclipse LS Extensions Snapshot Build"]
     types: [completed]
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 4cef4e721..4ba1607c0 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml
@@ -512,20 +512,55 @@
 								<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" />
 
-								<parallel failonany="true">
+<!--								<parallel failonany="true">-->
 
-									<exec executable="${project.build.directory}/../macos-notarize.sh" failonerror="true">
+									<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}}" />
 										<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}" />
+								<parallel failonany="true">
+									<exec executable="xcrun" failonerror="true">
+										<arg value="notarytool" />
+										<arg value="submit" />
+										<arg value="${dmgName}" />
+										<arg value="--keychain-profile" />
+										<arg value="notarize-app-dmg-profile" />
+										<arg value="--wait" />
+									</exec>
+									<exec executable="xcrun" failonerror="true">
+										<arg value="notarytool" />
+										<arg value="submit" />
+										<arg value="${dmgName-aarch64}" />
+										<arg value="--keychain-profile" />
+										<arg value="notarize-app-dmg-profile" />
+										<arg value="--wait" />
 									</exec>
-
 								</parallel>
 
+
+
+<!--									<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>