diff --git a/.gitea/workflows/sync-upstream.yaml b/.gitea/workflows/sync-upstream.yaml
new file mode 100644
index 0000000000..df8f915cd7
--- /dev/null
+++ b/.gitea/workflows/sync-upstream.yaml
@@ -0,0 +1,30 @@
+name: Sync Upstream Bluesky
+on:
+  schedule:
+    - cron: '0 */8 * * *'
+  workflow_dispatch:
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout main
+        uses: actions/checkout@v4
+        with:
+          ref: main
+          fetch-depth: 0
+
+      - name: Add upstream remote
+        run: git remote add upstream https://github.com/bluesky-social/social-app.git
+
+      - name: Fetch upstream
+        run: git fetch upstream
+
+      - name: Merge upstream changes
+        run: |
+          git config user.name "gitea-actions-bot"
+          git config user.email "toaster+git@proot.uk"
+          git merge upstream/main --no-edit
+
+      - name: Push to origin
+        run: git push origin main
\ No newline at end of file