diff --git a/.github/workflows/create_test_patches.yml b/.github/workflows/create_test_patches.yml
index 498466d638..aa647900f0 100644
--- a/.github/workflows/create_test_patches.yml
+++ b/.github/workflows/create_test_patches.yml
@@ -58,6 +58,9 @@ jobs:
           command: DETOX_DISABLE_POSTINSTALL=1 yarn && yarn lerna:prepare
 
       - name: Create Patches
+        env:
+          # yarn3+ by default disables lockfile alteration in CI. We want it.
+          YARN_ENABLE_IMMUTABLE_INSTALLS: false
         run: |
           PACKAGE_LIST=`find packages -maxdepth 1 -mindepth 1 -type d -exec basename {} \; | egrep -v 'template|invites'`
           mkdir $HOME/packages
@@ -71,10 +74,10 @@ jobs:
           done
           ls -la $HOME/packages/
           cd $HOME
-          npx react-native init template --skip-install
+          npx react-native init template --skip-install --skip-git-init
           cd template
           yarn
-          yarn add patch-package --save-dev
+          yarn add patch-package --dev
           mkdir patches || true
           for PACKAGE in $PACKAGE_LIST; do
             echo "Installing package $PACKAGE into fresh template app, then clobbering with PR version"
@@ -82,6 +85,8 @@ jobs:
             if [ -d node_modules/@react-native-firebase/$PACKAGE ]; then
               pushd node_modules/@react-native-firebase
               tar -zxf $HOME/packages/react-native-firebase-${PACKAGE}.tgz
+              # yarn3+ pack does not handle the executable bits on our scripts correctly. Fix.
+              chmod 755 package/ios_config.sh && true
               mv $PACKAGE/package.json package/
               \rm -fr $PACKAGE
               mv package $PACKAGE