diff --git a/.gitea/workflows/cloudflare-auto-pr-tofu-pipeline.yml b/.gitea/workflows/cloudflare-auto-pr-tofu-pipeline.yml
index 579716c..4181bf9 100644
--- a/.gitea/workflows/cloudflare-auto-pr-tofu-pipeline.yml
+++ b/.gitea/workflows/cloudflare-auto-pr-tofu-pipeline.yml
@@ -63,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,14 +131,7 @@ jobs:
           reconfigure: true
 
       - name: Tofu PR Commenter
-        uses: https://git.trez.wtf/Trez/terraform-tofu-pr-commenter@main
-        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 }}
-          GITHUB_TOKEN: ${{ secrets.BOT_GITEA_TOKEN }}
+        uses: https://git.trez.wtf/Trez/tf-pr-commenter@main
         with:
           commenter_type: init
           commenter_input: ${{ steps.tofu-init.outputs.init-output }}
@@ -149,16 +147,9 @@ jobs:
           out: cloudflare.tfplan
 
       - name: Tofu PR Commenter
-        uses: https://git.trez.wtf/Trez/terraform-tofu-pr-commenter@main
-        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 }}
-          GITHUB_TOKEN: ${{ secrets.BOT_GITEA_TOKEN }}
+        uses: https://git.trez.wtf/Trez/tf-pr-commenter@main
         with:
-          commenter_type: plan
+          command: plan
           commenter_input: ${{ steps.tofu-plan.outputs.plan-output }}
           commenter_exitcode: ${{ steps.tofu-plan.outputs.exitcode }}