diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ede16a9ffc14067be3da0647623f3e94ffe424c1..064e78cfe38c376b79dd16355a7dbdf343520425 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
       - name: Install dependencies
         run: |
-          yum install -y openssh-clients cmake wget git gcc-c++ gcc-gfortran python39 bzip2 diffutils zlib-devel rpm-build
+          yum install -y openssh-clients cmake wget git gcc-c++ gcc-gfortran python39 bzip2 diffutils zlib-devel rpm-build --skip-broken
           ln -s /usr/bin/python3 /usr/bin/python
       - uses: actions/checkout@v3
         with:
@@ -33,17 +33,25 @@ jobs:
         uses: hendrikmuhs/ccache-action@v1.2
       - name: Build
         run: |
-          export PATH="~/openfpm_dependencies/ccache-4.8-linux-x86_64/ccache:$PATH"
           ./build.sh $(pwd) unused pdata 0 ${{ github.ref }}
+      - uses: actions/cache/save@v3
+        if: always()
+        with:
+          path: ~/openfpm_dependencies/
+          key: almalinux-dep-${{ github.ref }}
+      - name: Create bundle
+        run: |
+          export PATH="$PATH:/usr/local/bin:"
+          source $HOME/openfpm_vars
           version=$(uname -m)
           ln -s ./LICENSE.md bsd3.txt
           ln -s ./README.md README.txt
+          cp $HOME/openfpm_vars $HOME/openfpm_dependencies/${{ github.ref }}/
+          cp $HOME/.openfpm.mk $HOME/openfpm_dependencies/${{ github.ref }}/
           cd build
-          export DEP_PACKING=~/openfpm_dependencies/${{ github.ref }}/
+          export DEP_PACKING=$HOME/openfpm_dependencies/${{ github.ref }}/
           printf " -DCPACK_RUN_INSTALL_DEPENDENCIES=ON" >> cmake_build_options;
           bash cmake_build_options;
-          cp ~/openfpm_vars ~/openfpm_dependencies/${{ github.ref }}/
-          cp ~/.openfpm.mk ~/openfpm_dependencies/${{ github.ref }}/
           echo "Calling CPACK"
           cpack -G RPM   centos
           if [ $? -ne 0 ]; then
@@ -51,11 +59,7 @@ jobs:
             exit 1
           fi
           mv openfpm_pdata-$ofp_version-Linux.rpm openfpm-$ofp_version-nightly-Linux-$version.rpm
-      - uses: actions/cache/save@v3
-        if: always()
-        with:
-          path: ~/openfpm_dependencies/
-          key: almalinux-dep-${{ github.ref }}
+
       - name: Upload Artifact
         uses: actions/upload-artifact@v2
         with:
@@ -82,19 +86,31 @@ jobs:
           key: macos-dep-${{ github.ref }}
       - name: Build
         run: |
-          export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
+          export CC=gcc-12
+          export CXX=g++-12
           ./build.sh $(pwd) unused pdata 0 ${{ github.ref }}
+      - uses: actions/cache/save@v3
+        if: always()
+        with:
+          path: ~/openfpm_dependencies/
+          key: macos-dep-${{ github.ref }}
+
+      - name: Create bundle
+        run: |
+          export PATH="$PATH:/usr/local/bin:"
+          export CC=gcc-12
+          export CXX=g++-12
           source $HOME/openfpm_vars
           version=$(uname -m)
           ln -s ./LICENSE.md bsd3.txt
           ln -s ./README.md README.txt
+          cp $HOME/openfpm_vars $HOME/openfpm_dependencies/${{ github.ref }}/
+          cp $HOME/.openfpm.mk $HOME/openfpm_dependencies/${{ github.ref }}/
           cd build
-          export DEP_PACKING=~/openfpm_dependencies/${{ github.ref }}/
+          export DEP_PACKING=$HOME/openfpm_dependencies/${{ github.ref }}/
           printf " -DCPACK_RUN_INSTALL_DEPENDENCIES=ON" >> cmake_build_options;
           tail cmake_build_options
           bash cmake_build_options;
-          cp ~/openfpm_vars ~/openfpm_dependencies/${{ github.ref }}/
-          cp ~/.openfpm.mk ~/openfpm_dependencies/${{ github.ref }}/
           echo "Calling CPACK"
           cpack -G productbuild osx
           if [ $? -ne 0 ]; then
@@ -102,11 +118,7 @@ jobs:
             exit 1
           fi
           mv openfpm_pdata-$ofp_version-Darwin.pkg openfpm-$ofp_version-nightly-Darwin-$version.pkg
-      - uses: actions/cache/save@v3
-        if: always()
-        with:
-          path: ~/openfpm_dependencies/
-          key: macos-dep-${{ github.ref }}
+
       - name: Upload Artifact
         uses: actions/upload-artifact@v2
         with: