diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index 9e53231d..56bd41a5 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -53,3 +53,5 @@ runs:
 
     - name: Derive appropriate SHAs for base and head for `nx affected` commands
       uses: nrwl/nx-set-shas@v4
+      with:
+        main-branch-name: 'develop'
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 42794c56..2dd093fc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@v4
         with:
-           # We need to fetch all branches and commits so that Nx affected has a base to compare against.
+          # We need to fetch all branches and commits so that Nx affected has a base to compare against.
           fetch-depth: 0
 
       - name: Install node, pnpm, and dependencies
@@ -42,6 +42,8 @@ jobs:
 
       - name: Derive appropriate SHAs for base and head for `nx affected` commands
         uses: nrwl/nx-set-shas@v4
+        with:
+          main-branch-name: 'develop'
 
       - run: pnpm exec nx-cloud record -- nx format:check
       - run: pnpm exec nx affected -t lint test build e2e --exclude=smoke --codeCoverage
diff --git a/nx.json b/nx.json
index 0b7b6f4c..b515ab32 100644
--- a/nx.json
+++ b/nx.json
@@ -93,5 +93,5 @@
     ],
     "sharedGlobals": ["{workspaceRoot}/.nx/workflows/**/**"]
   },
-  "defaultBase": "origin/develop"
+  "defaultBase": "develop"
 }