diff --git a/.forgejo/workflows/cleanup.yaml b/.forgejo/workflows/cleanup.yaml
index bf17be8..c81e3da 100644
--- a/.forgejo/workflows/cleanup.yaml
+++ b/.forgejo/workflows/cleanup.yaml
@@ -1,7 +1,7 @@
 on:
   pull_request:
-    types:
-      - closed
+  pull_request_target:
+    - closed
 
 jobs:
   cleanup-staging:
@@ -11,13 +11,9 @@ jobs:
     steps:
       - name: Pipeline info PR
         run: |
-          echo "Run triggered by ${{ github.event_name }} (${{ github.event.action }}) on ref ${{ github.ref_name }}"
+          echo "PR#${{ github.event.pull_request.number }} ${{ github.event.action }}"
 
-      - name: Staging Deployment - Prepare keys
+      - name: Deploy - Remove PR from staging
+        if: github.event.action == 'closed'
         run: |
-          echo "${{ secrets.SSH_DEPLOY_KEY }}" > deploykey.priv
-          chmod 400 deploykey.priv
-          echo "${{ secrets.SSH_KNOWN_HOSTS_FILE }}" > ./known_hosts
-      - name: Staging Deployment - Remove PR from staging
-        run: |
-          ssh -i deploykey.priv -o 'UserKnownHostsFile ./known_hosts' ccchh-website-deploy@public-web-static-intern.hamburg.ccc.de -t "rm -r /var/www/staging.hamburg.ccc.de/pr${{ github.event.pull_request.number }}/"
+          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 04dd8c2..af22d05 100644
--- a/.forgejo/workflows/deploy.yaml
+++ b/.forgejo/workflows/deploy.yaml
@@ -17,7 +17,7 @@ jobs:
     steps:
       - name: Pipeline info
         run: |
-          echo "Run triggered by ${{ github.event_name }} (${{ github.event.action }}) on ref ${{ github.ref_name }}"
+          echo "Run triggered by ${{ gitea.event_name }} on ref ${{ github.ref_name }}"
 
       - name: Install packages
         run: |
@@ -54,16 +54,6 @@ jobs:
         run: |
           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 - Add comment to PR with staging URL
-        if: github.event_name == 'pull_request' && github.event.action == 'opened'
-        run: |
-          curl \
-            -X POST \
-            ${{ github.event.pull_request.base.repo.url }}/issues/${{ github.event.pull_request.number }}/comments \
-            -H "Content-Type: application/json" \
-            -H "Authorization: token $GITHUB_TOKEN" \
-            --data '{ "body": "You can view your changes at https://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: |