diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
index 036c358b6..a2d537df9 100644
--- a/.github/workflows/node.js.yml
+++ b/.github/workflows/node.js.yml
@@ -83,9 +83,15 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-
 
-      - name: Install dependencies
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: yarn install --immutable
+      - name: Clear Yarn cache
+        run: yarn cache clean
+
+      - name: Clear Yarn cache
+        run: yarn cache clean
+
+      # - name: Install dependencies
+      #   if: steps.cache.outputs.cache-hit != 'true'
+      #   run: yarn install --immutable
 
       - name: Version
         run: yarn workspaces foreach --worktree --topological --exclude @ohri/openmrs-esm-ohri version "$(node -e "console.log(require('semver').inc(require('./package.json').version, 'patch'))")-pre.${{ github.run_number }}"
diff --git a/.yarnrc.yml b/.yarnrc.yml
index 4b8bff894..a8d2625f0 100644
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -5,3 +5,18 @@ enableGlobalCache: false
 nodeLinker: node-modules
 
 yarnPath: .yarn/releases/yarn-4.0.2.cjs
+
+changesetBaseRefs: [
+  "master",
+  "origin/master",
+  "upstream/master",
+  "main",
+  "origin/main",
+  "upstream/main",
+  "dev",
+  "origin/dev",
+  "upstream/dev",
+  "pretest",
+  "origin/pretest",
+  "upstream/pretest",
+]