diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index d385a272..fe3ca3c9 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,9 +4,5 @@
 # GitHub Actions and CI/CD
 /.github/ @jbdevprimary
 
-# Cursor rules and agent configuration
-/.cursor/ @jbdevprimary
-
 # Documentation
-/docs/ @jbdevprimary
 *.md @jbdevprimary
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index 344e5c6d..139e93e6 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -10,7 +10,7 @@ permissions:
 
 jobs:
   dependabot:
-    if: github.actor == 'dependabot[bot]'
+    if: github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'jbcom/jbcom.github.io'
     runs-on: ubuntu-latest
     steps:
       - name: Fetch Dependabot metadata
@@ -19,11 +19,9 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Approve and enable auto-merge (patch/minor only)
-        if: steps.metadata.outputs.update-type != 'version-update:semver-major'
+      - name: Enable auto-merge (patch/minor only)
+        if: steps.metadata.outputs.update-type != '' && steps.metadata.outputs.update-type != 'version-update:semver-major'
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           PR_URL: ${{ github.event.pull_request.html_url }}
-        run: |
-          gh pr review "$PR_URL" --approve
-          gh pr merge "$PR_URL" --squash --auto
+        run: gh pr merge "$PR_URL" --squash --auto