diff --git a/.changeset/config.json b/.changeset/config.json
index c5cc908fa5..d91b9b7212 100644
--- a/.changeset/config.json
+++ b/.changeset/config.json
@@ -32,7 +32,7 @@
   "linked": [],
   "access": "public",
   "privatePackages": false,
-  "baseBranch": "main",
+  "baseBranch": "v1.6.x",
   "updateInternalDependencies": "patch",
   "bumpVersionsWithWorkspaceProtocolOnly": true,
   "ignore": [],
diff --git a/.github/workflows/release-notes-draft.yml b/.github/workflows/release-notes-draft.yml
index c7eb2357ac..f1f005e596 100644
--- a/.github/workflows/release-notes-draft.yml
+++ b/.github/workflows/release-notes-draft.yml
@@ -10,6 +10,6 @@ jobs:
   draft:
     permissions:
       pull-requests: write
-    uses: better-auth/better-auth/.github/workflows/release-notes-draft.yml@0e02187ab45a903c66986fc5e28cddd37185147b
+    uses: better-auth/better-auth/.github/workflows/release-notes-draft.yml@9ca15f3726275f31d86cbd0a8cf21fea64441634
     secrets:
       RELEASE_APP_PRIVATE_KEY: ${{ secrets.RELEASE_APP_PRIVATE_KEY }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ff4d7998ba..99e7a165bb 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ jobs:
     permissions:
       contents: read
       id-token: write
-    uses: better-auth/better-auth/.github/workflows/release.yml@0e02187ab45a903c66986fc5e28cddd37185147b
+    uses: better-auth/better-auth/.github/workflows/release.yml@9ca15f3726275f31d86cbd0a8cf21fea64441634
     with:
       use_shared_tooling: true
     secrets:
diff --git a/.github/workflows/verify-changesets.yml b/.github/workflows/verify-changesets.yml
index 7a4384229b..ee42477d85 100644
--- a/.github/workflows/verify-changesets.yml
+++ b/.github/workflows/verify-changesets.yml
@@ -14,4 +14,4 @@ jobs:
     permissions:
       contents: read
       pull-requests: read
-    uses: better-auth/better-auth/.github/workflows/verify-changesets.yml@0e02187ab45a903c66986fc5e28cddd37185147b
+    uses: better-auth/better-auth/.github/workflows/verify-changesets.yml@9ca15f3726275f31d86cbd0a8cf21fea64441634