diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml
index f0bfb13..9569735 100644
--- a/.forgejo/workflows/deploy.yaml
+++ b/.forgejo/workflows/deploy.yaml
@@ -39,12 +39,13 @@ jobs:
           fetch-depth: 0 # pull full history for page lastmod by git commit date
 
       - name: Build website - prod
+        if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref_name == 'main'
         run: |
           ./fetch-calendar.sh
           hugo
 
       - name: Build website - staging
-        if: github.ref_name != 'main'
+        if: github.event_name == 'pull_request'
         run: |
           sed -i "s#baseURL = 'https://hamburg.ccc.de/'#baseURL = 'https://staging.hamburg.ccc.de/pr${{ github.event.pull_request.number }}/'#" hugo.toml
           sed -i "s#index = true#index = false#" hugo.toml
@@ -53,7 +54,6 @@ jobs:
           hugo --buildFuture
 
       - name: Deploy - Prepare keys
-        if: github.event_name == 'push' || github.event_name == 'pull_request' || github.event_name == 'schedule'
         run: |
           echo "${{ secrets.SSH_DEPLOY_KEY }}" > deploykey.priv
           chmod 400 deploykey.priv
@@ -79,8 +79,47 @@ jobs:
         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/hamburg.ccc.de/
 
-      - uses: actions/upload-artifact@v3
-        if: github.event_name == 'pull_request'
+      - name: Upload the website build as an artifact
+        uses: actions/upload-artifact@v4
         with:
           name: website-build
           path: public/
+
+  deploy-prod:
+    runs-on: docker
+    container:
+      image: code.forgejo.org/oci/node:22-bookworm
+    steps:
+      - name: Download the website build artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: website-build
+
+      - name: Install packages
+        run: |
+          apt update
+          # For uploading.
+          apt install -y rsync
+
+
+      - name: debugging
+        run: |
+          ls -la
+          echo "website-build:"
+          ls -la website-build
+
+  deploy-staging:
+    runs-on: docker
+    container:
+      image: code.forgejo.org/oci/node:22-bookworm
+    steps:
+      - name: Download the website build artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: website-build
+
+      - name: Install packages
+        run: |
+          apt update
+          # For uploading.
+          apt install -y rsync