diff --git a/.github/workflows/terraform_apply.yaml b/.github/workflows/terraform_apply.yaml
index a9a4d05..292208a 100644
--- a/.github/workflows/terraform_apply.yaml
+++ b/.github/workflows/terraform_apply.yaml
@@ -11,7 +11,7 @@ on:
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   # This workflow contains a single job called "build"
-  build:
+  Apply:
     # The type of runner that the job will run on
     runs-on: [ automation-repos ]
     env:
diff --git a/.github/workflows/terraform_plan.yaml b/.github/workflows/terraform_plan.yaml
index 50b6820..25f471d 100644
--- a/.github/workflows/terraform_plan.yaml
+++ b/.github/workflows/terraform_plan.yaml
@@ -10,7 +10,7 @@ on:
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   # This workflow contains a single job called "build"
-  build:
+  Plan:
     # The type of runner that the job will run on
     runs-on: [ automation-repos ]
     env:
@@ -68,24 +68,13 @@ jobs:
 
       - name: Terraform Plan
         id: plan
-        if: github.event_name == 'pull_request'
-        run: terraform plan -no-color -out=${{ vars.plan_cache }}/${{ github.sha }}
-        continue-on-error: true
-        
-      - name: Terraform Plan
-        if: github.event_name != 'pull_request'
         run: terraform plan -no-color
         continue-on-error: true
         
-      - name: Terraform Show plan
-        if: github.event_name == 'pull_request'
-        run: echo ::set-output name=terraform_plan::$(terraform show ${{ vars.plan_cache }}/${{ github.sha }})
-        
-      - name: Post Terraform Plan to PR
-        uses: CSVD/gh-actions-github-script@v6
+      - uses: CSVD/gh-actions-github-script@v6
         if: github.event_name == 'pull_request'
         env:
-          PLAN: "terraform\n${{ env.terraform_plan }}"
+          PLAN: "terraform\n${{ steps.plan.outputs.stdout }}"
         with:
           github-token: ${{ secrets.GH_TOKEN }}
           script: |