diff --git a/.gitea/workflows/auto-pr-tofu-plan.yml b/.gitea/workflows/auto-pr-tofu-plan.yml
index 619c0c7..6daf0c4 100644
--- a/.gitea/workflows/auto-pr-tofu-plan.yml
+++ b/.gitea/workflows/auto-pr-tofu-plan.yml
@@ -91,8 +91,6 @@ jobs:
             --output simple \
             | awk '{print $1}')
 
-          echo "${{ github.ref_name }}\n${{ github.repository_owner }}"
-
           echo "pr_number=$pr_number" >> "$GITHUB_OUTPUT"
 
       - name: Generate .env from Hashicorp Vault
@@ -106,6 +104,7 @@ jobs:
           ENV_FILE_NAME: cloudflare/.env
 
       - name: Export env vars from Vault .env
+        id: env-vault-vars
         run: |
           echo "🧩 Cleaning and loading cloudflare/.env into GitHub Actions environment..."
 
@@ -124,6 +123,10 @@ jobs:
             fi
           done < cloudflare/.env
 
+          repo_name=$(echo "${{ github.repository }}" | awk -F"/" '{print $2}')
+
+          echo "repo_name=$repo_name" >> "$GITHUB_OUTPUT"
+
       - name: Run tofu init
         uses: dnogu/tofu-init@v1
         with:
@@ -173,7 +176,7 @@ jobs:
           token: ${{ secrets.BOT_GITEA_TOKEN }}
           pr_index: ${{ steps.tea-pr-index.outputs.pr_number }}
           repo_owner: ${{ github.repository_owner }}
-          repo_name: ${{ github.ref_name }}
+          repo_name: ${{ steps.env-vault-vars.outputs.repo_name }}
           plan_file: cloudflare.tfplan
           comment_template: |
             🚀 **Tofu Plan Output**