diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml
index 9fa81eb..0ff05cb 100644
--- a/.forgejo/workflows/build.yml
+++ b/.forgejo/workflows/build.yml
@@ -7,29 +7,39 @@ on:
       - 'v*'
 
 jobs:
+  generate:
+    runs-on: stable
+    container:
+      image: git.euph.dev/actions/runner-java-21:1300
+    steps:
+      - name: "Checkout"
+        uses: "https://git.euph.dev/actions/checkout@v3"
+      - name: "Generate"
+        run: just generate
+      - name: Upload API Client as Artifact
+        uses: "https://git.euph.dev/actions/upload-artifact@v3"
+        with:
+          name: api-client
+          path: src/app/core/server/*
+
   build:
     runs-on: stable
+    needs:
+      - generate
     container:
       image: git.euph.dev/actions/runner-java-21:latest
     steps:
       - name: "Checkout"
         uses: "https://git.euph.dev/actions/checkout@v3"
+      - name: Download artifact from previous job
+        uses: "https://git.euph.dev/actions/download-artifact@v3"
+        with:
+          name: api-client
+          path: src/app/core/server
       - name: "Install Angular CLI"
         run: sudo npm i -g @angular/cli
       - name: "Install Dependencies"
         run: npm ci
-      - name: "Generate API Client"
-        run: |
-         API_VERSION="$(cat package.json | jq -r '.api_version')"
-         API_URL="https://git.euph.dev/TowerDefence/Server/releases/download/$API_VERSION/api.yml"
-         rm -rf src/app/core/server
-         mkdir -p src/app/core/server
-         npx @openapitools/openapi-generator-cli \
-           generate \
-           --openapitools src/app/core/openapitools.json \
-           -i "$API_URL" \
-           -g typescript-angular \
-           -o src/app/core/server
       - name: Build Bundle
         run: ng build
       - name: Upload Binary as Artifact