diff --git a/.github/scripts/sign-osx-distro-file.sh b/.github/scripts/sign-osx-distro-file.sh
index 3ea246efb..69fca5dfa 100755
--- a/.github/scripts/sign-osx-distro-file.sh
+++ b/.github/scripts/sign-osx-distro-file.sh
@@ -16,6 +16,11 @@ mkdir ${dir}/${destination_folder_name}
 tar -zxf $file --directory ${dir}/${destination_folder_name}
 echo "Successfully extracted ${filename}"
 
+# sign problematic binaries
+find ${dir}/${destination_folder_name}/SpringToolSuite4.app -print | grep ".*/libjansi\.jnilib$" | codesign --verbose --deep --force --timestamp --entitlements "${entitlements}" --options=runtime --keychain "${KEYCHAIN}" -s "${MACOS_CERTIFICATE_ID}"
+find ${dir}/${destination_folder_name}/SpringToolSuite4.app -print | grep ".*/fsevents\.node$" | codesign --verbose --deep --force --timestamp --entitlements "${entitlements}" --options=runtime --keychain "${KEYCHAIN}" -s "${MACOS_CERTIFICATE_ID}"
+
+# Sign the app
 codesign --verbose --deep --force --timestamp --entitlements "${entitlements}" --options=runtime --keychain "${KEYCHAIN}" -s "${MACOS_CERTIFICATE_ID}" ${dir}/${destination_folder_name}/SpringToolSuite4.app
 
 cd ${dir}/${destination_folder_name}
diff --git a/.github/workflows/eclipse-ls-extensions-build.yml b/.github/workflows/eclipse-ls-extensions-build.yml
index 008adc0fc..11ab7cd74 100644
--- a/.github/workflows/eclipse-ls-extensions-build.yml
+++ b/.github/workflows/eclipse-ls-extensions-build.yml
@@ -124,7 +124,7 @@ jobs:
 
   purge_cache:
     needs: [ eclipse-language-servers-build ]
-    if: ${{ inputs.build_type != 'snapshot' }}
+#    if: ${{ inputs.build_type != 'snapshot' }}
     runs-on: [self-hosted, macOS]
     steps:
       - uses: ./.github/actions/akamai-purge-osx
diff --git a/.github/workflows/gh-hosted-eclipse-distro-build.yml b/.github/workflows/gh-hosted-eclipse-distro-build.yml
index 566049da4..d468cfda1 100644
--- a/.github/workflows/gh-hosted-eclipse-distro-build.yml
+++ b/.github/workflows/gh-hosted-eclipse-distro-build.yml
@@ -266,6 +266,7 @@ jobs:
           do
             ${{ github.workspace }}/.github/scripts/notarize-osx-distro-file.sh $dmg_file $NOTARIZE_PROFILE &
           done
+          FAIL=0
           for job in `jobs -p`
           do
             wait $job || let "FAIL+=1"