diff --git a/.gitea/workflows/cloudflare-auto-pr-tofu-pipeline.yml b/.gitea/workflows/cloudflare-auto-pr-tofu-pipeline.yml
index 1243f1f..66a89bb 100644
--- a/.gitea/workflows/cloudflare-auto-pr-tofu-pipeline.yml
+++ b/.gitea/workflows/cloudflare-auto-pr-tofu-pipeline.yml
@@ -20,6 +20,9 @@ jobs:
     outputs:
       pr_number: ${{ steps.pr-check-create.outputs.pr_number }}
       pr_url: ${{ steps.pr-check-create.outputs.pr_url }}
+      pr_comments_url: ${{ steps.pr-check-create.outputs.pr_comments_url }}
+      pr_comment_id: ${{ steps.pr-check-create.outputs.pr_comment_id }}
+      pr_comment_uri: ${{ steps.pr-check-create.outputs.pr_comment_uri }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
@@ -60,6 +63,11 @@ jobs:
     needs: check-and-create-pr
     runs-on: ubuntu-latest
     env:
+      PR_NUMBER: ${{ needs.check-and-create-pr.outputs.pr_number }}
+      PR_URL: ${{ needs.check-and-create-pr.outputs.pr_url }}
+      PR_COMMENTS_URL: ${{ needs.check-and-create-pr.outputs.pr_comments_url }}
+      PR_COMMENT_ID: ${{ needs.check-and-create-pr.outputs.pr_comment_id }}
+      PR_COMMENT_URI: ${{ needs.check-and-create-pr.outputs.pr_comment_uri }}
       VAULT_TOKEN: ${{ secrets.VAULT_GITEA_TOKEN }}
     outputs:
       tofu-cloudflare-plan: ${{ steps.tofu_plan.outputs.plan-output }}
@@ -126,9 +134,6 @@ jobs:
         uses: https://git.trez.wtf/Trez/terraform-tofu-pr-commenter@main
         env:
           GITHUB_TOKEN: ${{ secrets.BOT_GITEA_TOKEN }}
-          PR_NUMBER: ${{ needs.check-and-create-pr.outputs.pr_number }}
-          PR_COMMENT_URL: ${{ needs.check-and-create-pr.outputs.pr_comments_url }}
-          PR_COMMENT_ID: ${{ needs.check-and-create-pr.outputs.pr_comment_id }}
         with:
           commenter_type: init
           commenter_input: ${{ steps.tofu-init.outputs.init-output }}
@@ -145,11 +150,6 @@ jobs:
 
       - name: Tofu PR Commenter
         uses: https://git.trez.wtf/Trez/terraform-tofu-pr-commenter@main
-        env:
-          GITHUB_TOKEN: ${{ secrets.BOT_GITEA_TOKEN }}
-          PR_NUMBER: ${{ needs.check-and-create-pr.outputs.pr_number }}
-          PR_COMMENT_URL: ${{ needs.check-and-create-pr.outputs.pr_comments_url }}
-          PR_COMMENT_URI: ${{ needs.check-and-create-pr.outputs.pr_comments_url }}
         with:
           commenter_type: plan
           commenter_input: ${{ steps.tofu-plan.outputs.plan-output }}