diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 78102488ba..a96c1f26ee 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -26,7 +26,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: .turbo
-          key: turbo-${{ runner.os }}-${{ github.job }}
+          key: turbo-${{ runner.os }}-${{ github.sha }}
           restore-keys: |
             turbo-${{ runner.os }}-
       - uses: actions/cache@v3
diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml
index 3a4bca5316..d2fe67a9e7 100644
--- a/.github/workflows/ci-pr.yml
+++ b/.github/workflows/ci-pr.yml
@@ -31,7 +31,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: .turbo
-          key: turbo-${{ runner.os }}-${{ github.job }}
+          key: turbo-${{ runner.os }}-${{ github.sha }}
           restore-keys: |
             turbo-${{ runner.os }}-
       - run: yarn install
diff --git a/turbo.json b/turbo.json
index b8e8f6f9a3..ee8d0c28d3 100644
--- a/turbo.json
+++ b/turbo.json
@@ -1,5 +1,5 @@
 {
-  "baseBranch": "origin/master",
+  "baseBranch": "origin/main",
   "pipeline": {
     "build": {
       "dependsOn": ["^build"]