diff --git a/.github/workflows/build_artifacts.yml b/.github/workflows/build_artifacts.yml
index bf7750e..44bec01 100644
--- a/.github/workflows/build_artifacts.yml
+++ b/.github/workflows/build_artifacts.yml
@@ -21,18 +21,23 @@ env:
   DATE: ${{ github.run_id }}
 
 jobs:
+
+  # Generate Rekku Token Job
+  Generate-Rekku-Token:
+    uses: RetroDECK/components-template/.github/workflows/generate_rekku_token.yml@main
+    secrets:
+      REKKU_PRIVATE_KEY: ${{ secrets.REKKU_PRIVATE_KEY }}
+
   Building-project:
     runs-on: ubuntu-latest
+    env:
+      REKKU_TOKEN: ${{ needs.Generate-Rekku-Token.outputs.rekku_token }}
 
     steps:
 
       - name: Prepearing environment
         run: curl -s "https://raw.githubusercontent.com/RetroDECK/components-template/refs/heads/main/automation_tools/install_dependencies.sh" | /bin/bash
 
-      - name: Generate a token for Rekku
-        id: generate-rekku-token
-        uses: RetroDECK/components-template/.github/workflows/generate_rekku_token.yml@main
-
       - name: Clone repo
         uses: actions/checkout@v4
         with:
diff --git a/.github/workflows/pr_from_upstream.yml b/.github/workflows/pr_from_upstream.yml
index 9244967..f6994fa 100644
--- a/.github/workflows/pr_from_upstream.yml
+++ b/.github/workflows/pr_from_upstream.yml
@@ -9,8 +9,17 @@ on:
           required: true
 
 jobs:
+
+  # Generate Rekku Token Job
+  Generate-Rekku-Token:
+    uses: RetroDECK/components-template/.github/workflows/generate_rekku_token.yml@main
+    secrets:
+      REKKU_PRIVATE_KEY: ${{ secrets.REKKU_PRIVATE_KEY }}
+
   sync-upstream:
     runs-on: ubuntu-latest
+    env:
+      REKKU_TOKEN: ${{ needs.Generate-Rekku-Token.outputs.rekku_token }}
 
     steps:
       - name: Checkout repository
@@ -23,10 +32,6 @@ jobs:
           git checkout "${{ github.ref_name }}"
           git branch --set-upstream-to=upstream/${{ github.ref_name }} ${{ github.ref_name }}
 
-      - name: Generate a token for Rekku
-        id: generate-rekku-token
-        uses: RetroDECK/components-template/.github/workflows/generate_rekku_token.yml@main
-
       - name: Configuring Git
         run: |
           git config --global protocol.file.allow always