diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bf00c10..9d125c3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,6 +25,7 @@ jobs:
           check-latest: true
       - run: |
           git config --global url."https://${{ secrets.gh_pat }}@github.com/charmbracelet".insteadOf "https://github.com/charmbracelet"
+          git config --global url."https://${{ secrets.gh_pat }}@github.com/charmcli".insteadOf "https://github.com/charmcli"
         if: env.GH_PAT != null
       - run: go install golang.org/x/vuln/cmd/govulncheck@latest
       - run: govulncheck ./...
@@ -41,6 +42,7 @@ jobs:
         uses: actions/checkout@v4
       - run: |
           git config --global url."https://${{ secrets.gh_pat }}@github.com/charmbracelet".insteadOf "https://github.com/charmbracelet"
+          git config --global url."https://${{ secrets.gh_pat }}@github.com/charmcli".insteadOf "https://github.com/charmcli"
         if: env.GH_PAT != null
       - name: Install Go
         uses: actions/setup-go@v5
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 45449ed..12750d9 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -25,6 +25,7 @@ jobs:
         uses: actions/checkout@v4
       - run: |
           git config --global url."https://${{ secrets.gh_pat }}@github.com/charmbracelet".insteadOf "https://github.com/charmbracelet"
+          git config --global url."https://${{ secrets.gh_pat }}@github.com/charmcli".insteadOf "https://github.com/charmcli"
         if: env.GH_PAT != null
       - name: Install Go
         uses: actions/setup-go@v5
diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml
index 92863f1..8a64dc6 100644
--- a/.github/workflows/goreleaser.yml
+++ b/.github/workflows/goreleaser.yml
@@ -70,6 +70,7 @@ jobs:
           lfs: ${{ inputs.lfs }}
       - run: |
           git config --global url."https://${{ secrets.gh_pat }}@github.com/charmbracelet".insteadOf "https://github.com/charmbracelet"
+          git config --global url."https://${{ secrets.gh_pat }}@github.com/charmcli".insteadOf "https://github.com/charmcli"
       - uses: actions/setup-go@v5
         with:
           go-version: ${{ inputs.go_version }}
diff --git a/.github/workflows/govulncheck.yml b/.github/workflows/govulncheck.yml
index 6b4a3f0..468400f 100644
--- a/.github/workflows/govulncheck.yml
+++ b/.github/workflows/govulncheck.yml
@@ -30,6 +30,7 @@ jobs:
     steps:
       - run: |
           git config --global url."https://${{ secrets.gh_pat }}@github.com/charmbracelet".insteadOf "https://github.com/charmbracelet"
+          git config --global url."https://${{ secrets.gh_pat }}@github.com/charmcli".insteadOf "https://github.com/charmcli"
         if: env.GH_PAT != null
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index d29935b..dd80a5c 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -51,6 +51,7 @@ jobs:
           lfs: ${{ inputs.lfs }}
       - run: |
           git config --global url."https://${{ secrets.gh_pat }}@github.com/charmbracelet".insteadOf "https://github.com/charmbracelet"
+          git config --global url."https://${{ secrets.gh_pat }}@github.com/charmcli".insteadOf "https://github.com/charmcli"
         if: env.GH_PAT != null
       - uses: actions/setup-go@v5
         with:
diff --git a/.github/workflows/ruleguard.yml b/.github/workflows/ruleguard.yml
index 2453b28..c4936f6 100644
--- a/.github/workflows/ruleguard.yml
+++ b/.github/workflows/ruleguard.yml
@@ -34,6 +34,7 @@ jobs:
     steps:
       - run: |
           git config --global url."https://${{ secrets.gh_pat }}@github.com/charmbracelet".insteadOf "https://github.com/charmbracelet"
+          git config --global url."https://${{ secrets.gh_pat }}@github.com/charmcli".insteadOf "https://github.com/charmcli"
         if: env.GH_PAT != null
       - uses: actions/checkout@v4
       - uses: actions/checkout@v4
diff --git a/.github/workflows/semgrep.yml b/.github/workflows/semgrep.yml
index 97006a2..8369b23 100644
--- a/.github/workflows/semgrep.yml
+++ b/.github/workflows/semgrep.yml
@@ -19,6 +19,7 @@ jobs:
     steps:
       - run: |
           git config --global url."https://${{ secrets.gh_pat }}@github.com/charmbracelet".insteadOf "https://github.com/charmbracelet"
+          git config --global url."https://${{ secrets.gh_pat }}@github.com/charmcli".insteadOf "https://github.com/charmcli"
         if: env.GH_PAT != null
       - uses: actions/checkout@v4
       - uses: actions/checkout@v4
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
index 5c5df42..690889b 100644
--- a/.github/workflows/snapshot.yml
+++ b/.github/workflows/snapshot.yml
@@ -31,6 +31,7 @@ jobs:
           fetch-depth: 0
       - run: |
           git config --global url."https://${{ secrets.gh_pat }}@github.com/charmbracelet".insteadOf "https://github.com/charmbracelet"
+          git config --global url."https://${{ secrets.gh_pat }}@github.com/charmcli".insteadOf "https://github.com/charmcli"
         if: env.GH_PAT != null
       - uses: actions/setup-go@v5
         with: