diff --git a/.github/scripts/sign-osx-distro-file.sh b/.github/scripts/sign-osx-distro-file.sh
index 9089644e9..0213f01ba 100755
--- a/.github/scripts/sign-osx-distro-file.sh
+++ b/.github/scripts/sign-osx-distro-file.sh
@@ -48,11 +48,6 @@ do
   codesign --verbose --deep --force --timestamp --entitlements "${entitlements}" --options=runtime --keychain "${KEYCHAIN}" -s "${MACOS_CERTIFICATE_ID}" $f
 done
 
-# These end being inside osx distro tar.gz file built on Linux
-#rm -rf ${dir}/${destination_folder_name}/SpringToolSuite4.app/plugins
-#rm -rf ${dir}/${destination_folder_name}/SpringToolSuite4.app/p2
-#rm -f ${dir}/${destination_folder_name}/SpringToolSuite4.app/artifacts.xml
-
 # Sign the app
 ls -la ${dir}/${destination_folder_name}/SpringToolSuite4.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/gh-hosted-eclipse-distro-build.yml b/.github/workflows/gh-hosted-eclipse-distro-build.yml
index 7948e54d2..d03a0dead 100644
--- a/.github/workflows/gh-hosted-eclipse-distro-build.yml
+++ b/.github/workflows/gh-hosted-eclipse-distro-build.yml
@@ -30,7 +30,7 @@ on:
 jobs:
 
   eclipse-distro-build:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
         with:
@@ -46,14 +46,14 @@ jobs:
           distribution: 'temurin'
       - name: Enforce https instead of http
         run: ./nohttp.sh
-#      - name: Start TCP Dump
-#        if: ${{ inputs.build_type == 'snapshot' }}
-#        run: |
-#          cd eclipse-distribution
-#          sudo apt-get install -y tcpdump
-#          echo "Installed tcpdump"
-#          sudo tcpdump -s 0 -i eth0 -w mycap.pcap &
-#          echo "Launched tcpdump"
+      - name: Start TCP Dump
+        if: ${{ inputs.build_type == 'snapshot' }}
+        run: |
+          cd eclipse-distribution
+          sudo apt-get install -y tcpdump
+          echo "Installed tcpdump"
+          sudo tcpdump -s 0 -i eth0 -w mycap.pcap &
+          echo "Launched tcpdump"
       - name: Install GPG key
         run: |
           echo "${{ secrets.GPG_PRIVATE_KEY }}" > gpg.asc
@@ -120,15 +120,15 @@ jobs:
           echo "P2 path: ${p2_path}"
           aws s3 rm s3://tools-spring-io/$p2_path/ --recursive
           aws s3 cp ./repository/ s3://tools-spring-io/$p2_path/ --recursive --no-progress
-#      - name: Store TCP Dump
-#        if: inputs.build_type == 'snapshot' && failure()
-#        id: tcp-dump-upload
-#        run: |
-#          tcpdump_path=${{ github.workspace }}/eclipse-distribution/mycap.pcap
-#          p2_path=${{ steps.s3-paths.outputs.p2_path }}
-#          echo "P2 path: ${p2_path}"
-#          echo "TCP Dump path: ${tcpdump_path}"
-#          aws s3 mv $tcpdump_path s3://tools-spring-io/tcpdump/cap-${{ inputs.eclipse_profile }}-${{ inputs.build_type }}-${{ github.run_id }}.pcap --no-progress
+      - name: Store TCP Dump
+        if: inputs.build_type == 'snapshot' && failure()
+        id: tcp-dump-upload
+        run: |
+          tcpdump_path=${{ github.workspace }}/eclipse-distribution/mycap.pcap
+          p2_path=${{ steps.s3-paths.outputs.p2_path }}
+          echo "P2 path: ${p2_path}"
+          echo "TCP Dump path: ${tcpdump_path}"
+          aws s3 mv $tcpdump_path s3://tools-spring-io/tcpdump/cap-${{ inputs.eclipse_profile }}-${{ inputs.build_type }}-${{ github.run_id }}.pcap --no-progress
       - name: Upload Linux Distro Build Artifacts
         run: |
           cd eclipse-distribution/org.springframework.boot.ide.product.${{ inputs.eclipse_profile }}/target/products
@@ -141,10 +141,11 @@ jobs:
             cd extracted
             tar -czf ../$file . 
             cd ..
-            rm -rf extracted          
+            rm -rf extracted
+          
             echo "Generate checksums for ${file}"
             shasum -a 256 $file > ${file}.sha256
-            md5 $file > ${file}.md5
+            md5sum $file > ${file}.md5
           done
           echo "Processing S3 update..."
           dist_path=${{ steps.s3-paths.outputs.dist_path }}
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 0003dc929..cb6968264 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e429/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e429/pom.xml
@@ -189,7 +189,7 @@
 								<arg>org.eclipse.equinox.p2.director</arg>
 								<arg>-nosplash</arg>
 								<arg>-destination</arg>
-								<arg>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolSuite4.app</arg>
+								<arg>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolSuite4.app/Contents/Eclipse</arg>
 								<arg>-repository</arg>
 								<arg>${justj.repository}</arg>
 								<arg>-installIUs</arg>
@@ -210,7 +210,7 @@
 								<arg>org.eclipse.equinox.p2.director</arg>
 								<arg>-nosplash</arg>
 								<arg>-destination</arg>
-								<arg>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/aarch64/SpringToolSuite4.app</arg>
+								<arg>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/aarch64/SpringToolSuite4.app/Contents/Eclipse</arg>
 								<arg>-repository</arg>
 								<arg>${justj.repository}</arg>
 								<arg>-installIUs</arg>
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e430/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e430/pom.xml
index 96c6397c6..49c4633ad 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e430/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e430/pom.xml
@@ -190,7 +190,7 @@
 								<arg>org.eclipse.equinox.p2.director</arg>
 								<arg>-nosplash</arg>
 								<arg>-destination</arg>
-								<arg>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolSuite4.app</arg>
+								<arg>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolSuite4.app/Contents/Eclipse</arg>
 								<arg>-repository</arg>
 								<arg>${justj.repository}</arg>
 								<arg>-installIUs</arg>
@@ -211,7 +211,7 @@
 								<arg>org.eclipse.equinox.p2.director</arg>
 								<arg>-nosplash</arg>
 								<arg>-destination</arg>
-								<arg>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/aarch64/SpringToolSuite4.app</arg>
+								<arg>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/aarch64/SpringToolSuite4.app/Contents/Eclipse</arg>
 								<arg>-repository</arg>
 								<arg>${justj.repository}</arg>
 								<arg>-installIUs</arg>
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e431/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e431/pom.xml
index 96c6397c6..49c4633ad 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e431/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e431/pom.xml
@@ -190,7 +190,7 @@
 								<arg>org.eclipse.equinox.p2.director</arg>
 								<arg>-nosplash</arg>
 								<arg>-destination</arg>
-								<arg>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolSuite4.app</arg>
+								<arg>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolSuite4.app/Contents/Eclipse</arg>
 								<arg>-repository</arg>
 								<arg>${justj.repository}</arg>
 								<arg>-installIUs</arg>
@@ -211,7 +211,7 @@
 								<arg>org.eclipse.equinox.p2.director</arg>
 								<arg>-nosplash</arg>
 								<arg>-destination</arg>
-								<arg>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/aarch64/SpringToolSuite4.app</arg>
+								<arg>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/aarch64/SpringToolSuite4.app/Contents/Eclipse</arg>
 								<arg>-repository</arg>
 								<arg>${justj.repository}</arg>
 								<arg>-installIUs</arg>