diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml
index 2e2dce7b6..9bd5f7c71 100644
--- a/.github/workflows/appimage.yml
+++ b/.github/workflows/appimage.yml
@@ -490,10 +490,10 @@ jobs:
           perl init-repository --module-subset=qtbase,qtwayland,qtimageformats,qtsvg,qttools,qtx11extras
           git submodule update qtbase qtwayland qtimageformats qtsvg qttools qtx11extras
           cd qtbase
-          git apply ../../patches/qtbase_${QT}.diff
+          find ../../patches/qtbase_${QT} -type f -print0 | sort -z | xargs -r0 git apply
           cd ..
           cd qtwayland
-          git apply ../../patches/qtwayland_${QT}.diff
+          find ../../patches/qtwayland_${QT} -type f -print0 | sort -z | xargs -r0 git apply
           cd ..
 
           ./configure -prefix /usr/local \
diff --git a/.github/workflows/mac-packaged.yml b/.github/workflows/mac-packaged.yml
index 8fa00fdd5..4097c9c88 100644
--- a/.github/workflows/mac-packaged.yml
+++ b/.github/workflows/mac-packaged.yml
@@ -80,6 +80,7 @@ jobs:
 
           xcodebuild -version > CACHE_KEY.txt
           echo $MANUAL_CACHING >> CACHE_KEY.txt
+          echo "$GITHUB_WORKSPACE" >> CACHE_KEY.txt
           if [ "$AUTO_CACHING" == "1" ]; then
             thisFile=$REPO_NAME/.github/workflows/mac-packaged.yml
             echo `md5 -q $thisFile` >> CACHE_KEY.txt