diff --git a/.github/scripts/sign-osx-distro-file.sh b/.github/scripts/sign-osx-distro-file.sh
index 69fca5dfa..ec39407c9 100755
--- a/.github/scripts/sign-osx-distro-file.sh
+++ b/.github/scripts/sign-osx-distro-file.sh
@@ -17,8 +17,11 @@ 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}"
+for file in `find ${dir}/${destination_folder_name}/SpringToolSuite4.app -print | grep -E ".*/(libjansi\.jnilib|fsevents\.node)$"`
+do
+  echo "Signing binary file: ${file}"
+  codesign --verbose --deep --force --timestamp --entitlements "${entitlements}" --options=runtime --keychain "${KEYCHAIN}" -s "${MACOS_CERTIFICATE_ID}" $file
+done
 
 # Sign the app
 codesign --verbose --deep --force --timestamp --entitlements "${entitlements}" --options=runtime --keychain "${KEYCHAIN}" -s "${MACOS_CERTIFICATE_ID}" ${dir}/${destination_folder_name}/SpringToolSuite4.app
diff --git a/.github/workflows/eclipse-ls-extensions-build.yml b/.github/workflows/eclipse-ls-extensions-build.yml
index 8aa0ae15f..008adc0fc 100644
--- a/.github/workflows/eclipse-ls-extensions-build.yml
+++ b/.github/workflows/eclipse-ls-extensions-build.yml
@@ -100,7 +100,7 @@ jobs:
           aws s3 rm s3://dist.springsource.com/${p2_path}/ --recursive
           aws s3 cp ${{ github.workspace }}/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/target/repository/ s3://dist.springsource.com/${p2_path}/ --recursive --acl public-read --no-progress
       - name: Compute invalid URLs
-#        if: ${{ inputs.build_type != 'snapshot' }}
+        if: ${{ inputs.build_type != 'snapshot' }}
         id: compute-invalid-urls
         run: |
           invalid_urls=`aws s3 ls s3://tools-spring-io/${{ steps.upload-p2-to-akamai.outputs.p2_path }}/ --recursive | awk '{$1=$2=$3=""; print $0}' | sed -e 's/^[ \t]*/https:\/\/cdn.spring.io\/spring-tools\//' | paste -sd' ' -`
@@ -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