diff --git a/.github/workflows/global-sync-next-branch.yml b/.github/workflows/global-sync-next-branch.yml
index 40f66e0e07..3067ff0aa3 100644
--- a/.github/workflows/global-sync-next-branch.yml
+++ b/.github/workflows/global-sync-next-branch.yml
@@ -8,12 +8,17 @@ on:
   push:
     branches:
       - main
+  pull_request: 
+    branches:
+      - main
   workflow_dispatch:
 
 concurrency: merge_main
 
 jobs:
-  merge-branch:
+  # When a PR is merged into main, attempt to merge main into next
+  sync-next-branch:
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout 🛎
@@ -31,3 +36,16 @@ jobs:
         run: gh pr merge --merge --auto "${{ steps.cpr.outputs.pr_number }}"
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  # Retarget to next branch if PR is opened against main (and head is not next)
+  retarget-feature-prs:
+    if: github.event_name == 'pull_request' && github.event.action == 'opened' && github.base_ref == 'main' && github.head_ref != 'next'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout 🛎
+        uses: actions/checkout@v4
+      - name: Change PR target
+        run: gh pr edit ${{ github.event.number }} --base next
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      
+        
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index dab1cb4005..9941d5c74e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -13,3 +13,7 @@ _NOTE: In-app contact form is still in development. Use GitHub issues for action
 You can contribute and help us localize the app.
 
 We are investigating how to simplify localization, but for now you can contribute by creating a Pull-Request with changes. App localizations are located in `locales` directory of this repository. You can review existing localizations or create a new one by copying one of existing localizations and populate it with data.
+
+## Development
+
+See out [Development](/DEVELOPMENT.md) guides for more info.