diff --git a/.forgejo/workflows/cleanup.yaml b/.forgejo/workflows/cleanup.yaml
new file mode 100644
index 0000000..c81e3da
--- /dev/null
+++ b/.forgejo/workflows/cleanup.yaml
@@ -0,0 +1,19 @@
+on:
+  pull_request:
+  pull_request_target:
+    - closed
+
+jobs:
+  cleanup-staging:
+    runs-on: docker
+    container:
+      image: code.forgejo.org/oci/node:20-bookworm
+    steps:
+      - name: Pipeline info PR
+        run: |
+          echo "PR#${{ github.event.pull_request.number }} ${{ github.event.action }}"
+
+      - name: Deploy - Remove PR from staging
+        if: github.event.action == 'closed'
+        run: |
+          ssh -i deploykey.priv -o 'UserKnownHostsFile ./known_hosts' ccchh-website-deploy@public-web-static-intern.hamburg.ccc.de -t "rm -r /var/www/next.hamburg.ccc.de/pr${{ github.event.pull_request.number }}/"
diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml
index 31ed7d9..97dde69 100644
--- a/.forgejo/workflows/deploy.yaml
+++ b/.forgejo/workflows/deploy.yaml
@@ -34,23 +34,24 @@ jobs:
       - name: Patch baseURL (staging only)
         if: github.ref_name != 'main'
         run: |
-          sed -i "s#baseURL = 'https://hamburg.ccc.de/'#baseURL = 'https://next.hamburg.ccc.de/'#" hugo.toml
+          sed -i "s#baseURL = 'https://hamburg.ccc.de/'#baseURL = 'https://staging.hamburg.ccc.de/pr${{ github.event.pull_request.number }}/'#" hugo.toml
       - name: Build website
         run: |
           ./fetch-calendar.sh
           hugo
 
       - name: Deploy - Prepare keys
-        if: github.event_name == 'push'
+        if: github.event_name == 'push' || github.event_name == 'pull_request'
         run: |
           echo "${{ secrets.SSH_DEPLOY_KEY }}" > deploykey.priv
           chmod 400 deploykey.priv
           echo "${{ secrets.SSH_KNOWN_HOSTS_FILE }}" > ./known_hosts
 
-      - name: Deploy - Upload to staging
-        if: github.event_name == 'push' && github.ref_name != 'main'
+      - name: Deploy - Upload PR to staging
+        if: github.event_name == 'pull_request'
         run: |
-          rsync -v -r --delete -e "ssh -i deploykey.priv -o 'UserKnownHostsFile ./known_hosts'" public/ ccchh-website-deploy@public-web-static-intern.hamburg.ccc.de:/var/www/next.hamburg.ccc.de/
+          echo "Deploying to staging.hamburg.ccc.de/pr${{ github.event.pull_request.number }}"
+          rsync -v -r --delete -e "ssh -i deploykey.priv -o 'UserKnownHostsFile ./known_hosts'" public/ ccchh-website-deploy@public-web-static-intern.hamburg.ccc.de:/var/www/staging.hamburg.ccc.de/pr${{ github.event.pull_request.number }}/
       - name: Deploy - Upload to prod
         if: github.event_name == 'push' && github.ref_name == 'main'
         run: |