diff --git a/.github/workflows/deploy_dev_docs_to_cf.yaml b/.github/workflows/deploy_dev_docs_to_cf.yaml
index 64d7e532354..bb2b403d13d 100644
--- a/.github/workflows/deploy_dev_docs_to_cf.yaml
+++ b/.github/workflows/deploy_dev_docs_to_cf.yaml
@@ -80,11 +80,24 @@ jobs:
           mv public staging/dev
           mv staging/dev/releases.releases staging/releases.releases
 
-      - name: Push to Cloudflare Branch
-        uses: peaceiris/actions-gh-pages@84c30a85c19949d7eee79c4ff27748b70285e453 # v4
+      - name: Checkout Cloudflare Branch
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./.hugo/staging
-          publish_branch: cloudflare-pages
-          keep_files: true
-          commit_message: "deploy: ${{ github.event.head_commit.message }}"
+          ref: cloudflare-pages
+          path: cf-pages-temp
+
+      - name: Push to Cloudflare Branch
+        run: |
+          cd $GITHUB_WORKSPACE/cf-pages-temp
+          rm -rf dev
+          
+          # copy over the dev build and releases file from staging
+          cp -r ../.hugo/staging/dev ./dev
+          cp ../.hugo/staging/releases.releases ./releases.releases || true
+          
+          # Commit and push the clean build
+          git config user.name "release-please[bot]"
+          git config user.email "55107282+release-please[bot]@users.noreply.github.com"
+          git add .
+          
+          git diff-index --quiet HEAD || git commit -m "deploy dev docs: ${{ github.event.head_commit.message }}" && git push origin cloudflare-pages
diff --git a/.github/workflows/deploy_versioned_docs_to_cf.yaml b/.github/workflows/deploy_versioned_docs_to_cf.yaml
index 59a9b07f239..e9b83b287ab 100644
--- a/.github/workflows/deploy_versioned_docs_to_cf.yaml
+++ b/.github/workflows/deploy_versioned_docs_to_cf.yaml
@@ -94,12 +94,24 @@ jobs:
         run: npx pagefind --site public
         working-directory: .hugo
 
-      - name: Deploy to root
-        uses: peaceiris/actions-gh-pages@84c30a85c19949d7eee79c4ff27748b70285e453 # v4
+      - name: Checkout Cloudflare Branch for Root
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: .hugo/public
-          publish_branch: cloudflare-pages
-          keep_files: true
-          allow_empty_commit: true
-          commit_message: "deploy: docs to root for ${{ steps.get_version.outputs.VERSION }}"
+          ref: cloudflare-pages
+          path: cf-pages-root-temp
+
+      - name: Deploy to root
+        run: |
+          cd $GITHUB_WORKSPACE/cf-pages-root-temp
+          # Delete older pagefind search indexes
+          rm -rf pagefind
+          
+          # Copy over the fresh root build
+          cp -r ../.hugo/public/* .
+          
+          # Commit and push the clean build
+          git config user.name "release-please[bot]"
+          git config user.email "55107282+release-please[bot]@users.noreply.github.com"
+          git add .
+          
+          git diff-index --quiet HEAD || git commit -m "deploy: docs to root for ${{ steps.get_version.outputs.VERSION }}" && git push origin cloudflare-pages