diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml
index 8fcd26b3f391..8ef8561ba685 100644
--- a/.github/workflows/alpine.yml
+++ b/.github/workflows/alpine.yml
@@ -69,14 +69,16 @@ jobs:
                         redis \
                         rabbitmq-server \
 
-          - name: Setup ccache
+          - name: Setup caches
             shell: alpine.sh --root {0}
             run: |
                 echo "Cached CPM packages:"
-                ls -lha ${{env.CPM_SOURCE_CACHE}}
-                for d in $(ls ${{env.CPM_SOURCE_CACHE}})
+                du -h -d 1 ${{env.CPM_SOURCE_CACHE}}
+                for f in $(find ${{env.CPM_SOURCE_CACHE}} -name "cmake.lock");
                 do
-                  git config --global --add safe.directory ${{env.CPM_SOURCE_CACHE}}/$d
+                  repo=$(ls -d $(dirname $f)/*/);
+                  echo "Repository: $repo";
+                  git config --global --add safe.directory $repo;
                 done
 
                 ccache -M 2.0GB
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 106016aeb0ba..d5b639bce4eb 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -48,9 +48,9 @@ jobs:
                 path: |
                   ${{env.CCACHE_DIR}}
                   ${{env.CPM_SOURCE_CACHE}}
-                key: 'macos-cache-dir ${{github.ref}} run-${{github.run_number}}'
+                key: 'macos-cache-dir ${{github.ref}}'
                 restore-keys: |
-                  macos-cache-dir ${{github.ref}} run-
+                  macos-cache-dir ${{github.ref}}
                   macos-cache-dir
 
           - name: Install brew packages