diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml
index c317265..25ff1e8 100644
--- a/.forgejo/workflows/deploy.yaml
+++ b/.forgejo/workflows/deploy.yaml
@@ -33,16 +33,19 @@ jobs:
         with:
           fetch-depth: 0 # pull full history for page lastmod by git commit date
 
-      - name: Patch baseURL (staging only)
+      - name: Build website - prod
+        run: |
+          ./fetch-calendar.sh
+          hugo
+
+      - name: Build website - staging
         if: github.ref_name != 'main'
         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
           sed -i "s#follow = true#follow = false#" hugo.toml
-      - name: Build website
-        run: |
           ./fetch-calendar.sh
-          hugo
+          hugo --buildFuture
 
       - name: Deploy - Prepare keys
         if: github.event_name == 'push' || github.event_name == 'pull_request' || github.event_name == 'schedule'