diff --git a/.github/sync/pull-request.yml b/.github/sync/pull-request.yml
new file mode 100644
index 0000000..1b44786
--- /dev/null
+++ b/.github/sync/pull-request.yml
@@ -0,0 +1,64 @@
+group:
+  repos:
+  - jazzband/contextlib2
+  - jazzband/django-admin2
+  - jazzband/django-analytical
+  - jazzband/django-auditlog
+  - jazzband/django-authority
+  - jazzband/django-axes
+  - jazzband/django-celery-monitor
+  - jazzband/django-configurations
+  - jazzband/django-constance
+  - jazzband/django-dbtemplates
+  - jazzband/django-ddp
+  - jazzband/django-debug-toolbar
+  - jazzband/django-defender
+  - jazzband/django-discover-jenkins
+  - jazzband/django-downloadview
+  - jazzband/django-eav2
+  - jazzband/django-embed-video
+  - jazzband/django-flags
+  - jazzband/django-flatblocks
+  - jazzband/django-floppyforms
+  - jazzband/django-formtools
+  - jazzband/django-hosts
+  - jazzband/django-ical
+  - jazzband/django-model-utils
+  - jazzband/django-mongonaut
+  - jazzband/django-newsletter
+  - jazzband/django-nose
+  - jazzband/django-oauth-toolkit
+  - jazzband/django-payments
+  - jazzband/django-pipeline
+  - jazzband/django-push-notifications
+  - jazzband/django-queued-storage
+  - jazzband/django-redis
+  - jazzband/django-redshift-backend
+  - jazzband/django-revproxy
+  - jazzband/django-robots
+  - jazzband/django-silk
+  - jazzband/django-simple-history
+  - jazzband/django-simple-menu
+  - jazzband/django-smart-selects
+  - jazzband/django-sortedm2m
+  - jazzband/django-sorter
+  - jazzband/django-taggit
+  - jazzband/django-tinymce
+  - jazzband/django-user-sessions
+  - jazzband/django-voting
+  - jazzband/django-widget-tweaks
+  - jazzband/djangorestframework-simplejwt
+  - jazzband/docopt-ng
+  - jazzband/geojson
+  - jazzband/help
+  - jazzband/icalevents
+  - jazzband/imaplib2
+  - jazzband/jsonmodels
+  - jazzband/pathlib2
+  - jazzband/pip-tools
+  - jazzband/prettytable
+  - jazzband/sorl-thumbnail
+  - jazzband/tablib
+  - jazzband/website
+  files:
+    - CODE_OF_CONDUCT.md
diff --git a/.github/sync.yml b/.github/sync/push.yml
similarity index 98%
rename from .github/sync.yml
rename to .github/sync/push.yml
index c8887e9..bce1bc2 100644
--- a/.github/sync.yml
+++ b/.github/sync/push.yml
@@ -63,4 +63,3 @@ group:
   files:
     - source: configs/.pullapprove.yml
       dest: .pullapprove.yml
-    - CODE_OF_CONDUCT.md
diff --git a/.github/workflows/repo-file-sync-pull-request.yml b/.github/workflows/repo-file-sync-pull-request.yml
new file mode 100644
index 0000000..32fa673
--- /dev/null
+++ b/.github/workflows/repo-file-sync-pull-request.yml
@@ -0,0 +1,28 @@
+name: Sync files (pull request)
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v2.3.5
+
+      - name: Run GitHub File Sync
+        uses: BetaHuhn/repo-file-sync-action@v1.15.0
+        with:
+          GH_PAT: ${{ secrets.SYNC_TOKEN }}
+          ASSIGNEES: jezdez
+          COMMIT_PREFIX: "Jazzband:"
+          BRANCH_PREFIX: "jazzband/sync"
+          COMMIT_EACH_FILE: true
+          GIT_EMAIL: jazzband-bot@users.noreply.github.com
+          GIT_USERNAME: jazzband-bot
+          DRY_RUN: true
+          OVERWRITE_EXISTING_PR: true
+          SKIP_PR: false
+          CONFIG_PATH: .github/sync/pull-request.yml
diff --git a/.github/workflows/repo-file-sync.yml b/.github/workflows/repo-file-sync-push.yml
similarity index 81%
rename from .github/workflows/repo-file-sync.yml
rename to .github/workflows/repo-file-sync-push.yml
index 0a4bbe4..5488766 100644
--- a/.github/workflows/repo-file-sync.yml
+++ b/.github/workflows/repo-file-sync-push.yml
@@ -1,4 +1,4 @@
-name: Sync files
+name: Sync files (push)
 on:
   push:
     branches:
@@ -23,3 +23,6 @@ jobs:
           GIT_EMAIL: jazzband-bot@users.noreply.github.com
           GIT_USERNAME: jazzband-bot
           DRY_RUN: true
+          OVERWRITE_EXISTING_PR: true
+          SKIP_PR: true
+          CONFIG_PATH: .github/sync/push.yml