diff --git a/.forgejo/workflows/tofu-plan-k8s-wheatley.yaml b/.forgejo/workflows/tofu-plan-k8s-wheatley.yaml
index b2efbe7..b1cfa72 100644
--- a/.forgejo/workflows/tofu-plan-k8s-wheatley.yaml
+++ b/.forgejo/workflows/tofu-plan-k8s-wheatley.yaml
@@ -55,7 +55,6 @@ jobs:
 
       - name: Add comment
         id: comment
-        if: always()
         env:
           COMMENT_BODY: |
             ### ${{forge.workflow}}
diff --git a/.forgejo/workflows/tofu-plan-templates.yaml b/.forgejo/workflows/tofu-plan-templates.yaml
index 3ce63a5..a28e9b7 100644
--- a/.forgejo/workflows/tofu-plan-templates.yaml
+++ b/.forgejo/workflows/tofu-plan-templates.yaml
@@ -3,12 +3,12 @@ name: tofu plan k8s-wheatley
 on:
   workflow_dispatch:
   workflow_call:
-  pull_request:
-    branches:
-      - main
-    paths:
-      - pve01.wheatley.in/templates/**
-      - .forgejo/workflows/tofu-plan-templates.yaml
+  # pull_request:
+  #   branches:
+  #     - main
+  #   paths:
+  #     - pve01.wheatley.in/templates/**
+  #     - .forgejo/workflows/tofu-plan-templates.yaml
 
 jobs:
   tofu-plan-k8s-wheatley:
@@ -24,18 +24,12 @@ jobs:
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       TF_VAR_proxmox_endpoint: ${{ secrets.PROXMOX_ENDPOINT }}
       TF_VAR_proxmox_api_token: ${{ secrets.PROXMOX_API_TOKEN }}
-      PR_NUMBER: ${{ forge.event.pull_request.number }}
     steps:
       - uses: https://github.com/actions/checkout@v4
       - uses: https://github.com/opentofu/setup-opentofu@v1
         with:
           tofu_version: 1.11.5
 
-      - name: Install deps
-        run: |
-          apt update
-          apt install -y jq
-
       - name: OpenTofu Init
         id: init
         run: tofu init --upgrade
@@ -52,55 +46,3 @@ jobs:
         id: plan
         run: tofu plan -no-color
         continue-on-error: true
-
-      - name: Add comment
-        id: comment
-        if: always()
-        env:
-          COMMENT_BODY: |
-            ### ${{forge.workflow}}
-            #### ${{ steps.fmt.outcome == 'success' && '✅' || '❌' }} OpenTofu Format and Style 🖌
-            #### ${{ steps.init.outcome == 'success' && '✅' || '❌' }} OpenTofu Initialization ⚙️
-            #### ${{ steps.validate.outcome == 'success' && '✅' || '❌' }} OpenTofu Validation 🤖
-            <details><summary>Validation Output</summary>
-
-            ```
-            ${{ steps.validate.outputs.stdout }}
-            ```
-
-            </details>
-
-            #### ${{ steps.plan.outcome == 'success' && '✅' || '❌' }} OpenTofu Plan 📖
-
-            <details><summary>Show Plan</summary>
-
-            ```
-            ${{ steps.plan.outputs.stdout }}
-            ```
-
-            </details>
-        run: |
-          payload=$(jq -Rs --arg body "$COMMENT_BODY" '{body: $body}' <<< "$COMMENT_BODY")
-
-          existing_comment=$(curl -s \
-            -H "Authorization: token ${{ secrets.FORGEJO_TOKEN }}" \
-            "${{ forge.api_url }}/repos/${{ forge.repository }}/issues/$PR_NUMBER/comments")
-          comment_id=$(echo "$existing_comment" | jq -r \
-            '.[] | select(.body | test("${{ forge.workflow }}")) | .id' | head -n 1)
-
-
-          if [ -n "${comment_id}" ] && [ "${comment_id}" != "null" ]; then
-            echo "Found comment with id ${comment_id}, updating..." && \
-            curl -s -X PATCH \
-              -H "Authorization: token ${{ secrets.FORGEJO_TOKEN }}" \
-              -H "Content-Type: application/json" \
-              "${{ forge.api_url }}/repos/${{ forge.repository }}/issues/comments/${comment_id}" \
-              -d "$payload"
-          else
-            echo "Creating new comment..." && \
-            curl -s -X POST \
-              -H "Authorization: token ${{ secrets.FORGEJO_TOKEN }}" \
-              -H "Content-Type: application/json" \
-              "${{ forge.api_url }}/repos/${{ forge.repository }}/issues/$PR_NUMBER/comments" \
-              -d "$payload"
-          fi