diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml
index ce5c01b..6762b3a 100644
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -12,14 +12,31 @@ concurrency:
 
 jobs:
   build_test_package:
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     steps:
       - name: Show Java and Maven versions
         run: |
           java -version
           mvn -v
-      # Gitea act_runner provides the repo workspace by default.
       - name: Build and test
         run: mvn -B -DskipTests=false clean verify
       - name: Package
         run: mvn -B -DskipTests clean package
+
+  auto_merge:
+    runs-on: ubuntu-latest
+    needs: build_test_package
+    if: ${{ github.event_name == 'pull_request' && needs.build_test_package.result == 'success' }}
+    steps:
+      - name: Auto-merge PR on success
+        env:
+          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+          REPO: ${{ github.repository }}
+        run: |
+          if [ -z "$GITEA_TOKEN" ]; then
+            echo "GITEA_TOKEN not set, skipping auto-merge"; exit 0;
+          fi
+          curl -sS -H "Authorization: token $GITEA_TOKEN" -H 'Content-Type: application/json' \
+            -X POST "http://localhost:3000/api/v1/repos/${REPO}/pulls/${PR_NUMBER}/merge" \
+            -d '{"Do":"squash","delete_branch_after_merge":true}'