diff --git a/.github/workflows/github-actions-cron-sync-fork-from-upstream.yml b/.github/workflows/github-actions-cron-sync-fork-from-upstream.yml
index e91e0633cc..2c62d06a12 100644
--- a/.github/workflows/github-actions-cron-sync-fork-from-upstream.yml
+++ b/.github/workflows/github-actions-cron-sync-fork-from-upstream.yml
@@ -41,4 +41,10 @@ jobs:
         # You can also manually trigger a workflow dispatch with the force
         # value equal to 'true'.
         force: ${{ github.event.inputs.force || (secrets.UPSTREAM_SYNC == 'always overwrite master branch') }}
+        # Quarterly release tags are only created upstream (see
+        # github-actions-quarterly-tag.yml); mirror the exact tag object
+        # here instead of letting this repo mint its own, which is what
+        # caused tag drift (same commit, two different annotated tag
+        # objects, breaking plain `git fetch` between the two remotes).
+        syncTags: true
         deployKey: ${{ secrets.DEPLOY_KEY }}
diff --git a/.github/workflows/github-actions-quarterly-tag.yml b/.github/workflows/github-actions-quarterly-tag.yml
index a41bc979b3..706412689c 100644
--- a/.github/workflows/github-actions-quarterly-tag.yml
+++ b/.github/workflows/github-actions-quarterly-tag.yml
@@ -14,6 +14,7 @@ jobs:
   create-tag:
     name: Create quarterly tag
     runs-on: ubuntu-latest
+    if: github.repository == 'The-OpenROAD-Project/OpenROAD-flow-scripts'
     permissions:
       contents: write
     steps: