diff --git a/.github/actions/equivalence-test/action.yml b/.github/actions/equivalence-test/action.yml
index 2763f028f1a5..d35986be6f5b 100644
--- a/.github/actions/equivalence-test/action.yml
+++ b/.github/actions/equivalence-test/action.yml
@@ -58,6 +58,8 @@ runs:
       if: steps.execute.outputs.changed == 'true'
       shell: bash
       run: |
+        git config --global user.email "teamterraform@hashicorp.com"
+        git config --global user.name "Team Terraform"
         git checkout -b ${{ inputs.new-branch }}
         git add testing/equivalence-tests/outputs
         git commit -m "Update equivalence test golden files."
@@ -71,5 +73,5 @@ runs:
           --base ${{ inputs.current-branch }} \
           --head ${{ inputs.new-branch }} \
           --title "Update equivalence test golden files" \
-          --body "This PR updates the equivalence test golden files." \
+          --body "{{ inputs.message }}" \
           --reviewer ${{ inputs.reviewers }}
diff --git a/.github/workflows/equivalence-test-diff.yml b/.github/workflows/equivalence-test-diff.yml
index 6967cab5c41d..fed8b5bf3ff9 100644
--- a/.github/workflows/equivalence-test-diff.yml
+++ b/.github/workflows/equivalence-test-diff.yml
@@ -6,12 +6,14 @@ on:
       - synchronize
       - ready_for_review
       - reopened
-      - synchronize
 
 permissions:
   contents: read
   pull-requests: write
 
+env:
+  GH_TOKEN: ${{ github.token }}
+
 jobs:
   equivalence-test-diff:
     name: "Equivalence Test Diff"
@@ -35,7 +37,7 @@ jobs:
         shell: bash
         run: |
           ./.github/scripts/equivalence-test.sh download_equivalence_test_binary \
-            0.3.0 \
+            0.4.0 \
             ./bin/equivalence-tests \
             linux \
             amd64
@@ -59,7 +61,7 @@ jobs:
         shell: bash
         run: |
           gh pr comment ${{ github.event.pull_request.number }} \
-            --body "The equivalence tests failed. Please investigate [here](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}/job/${{ github.job }})."
+            --body "The equivalence tests failed. Please investigate [here](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})."
           exit 1 # fail the job
 
       - name: Equivalence tests changed
@@ -67,4 +69,4 @@ jobs:
         shell: bash
         run: |
           gh pr comment ${{ github.event.pull_request.number }} \
-            --body "The equivalence tests will be updated. Please verify the changes [here](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}/job/${{ github.job }})."
+            --body "The equivalence tests will be updated. Please verify the changes [here](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})."
diff --git a/.github/workflows/equivalence-test-manual-update.yml b/.github/workflows/equivalence-test-manual-update.yml
index 615c43a10d17..3dbd6dc1aa99 100644
--- a/.github/workflows/equivalence-test-manual-update.yml
+++ b/.github/workflows/equivalence-test-manual-update.yml
@@ -13,14 +13,17 @@ on:
         required: true
       equivalence-test-version:
         type: string
-        description: 'Equivalence testing framework version to use (no v prefix, eg. 0.3.0).'
-        default: "0.3.0"
+        description: 'Equivalence testing framework version to use (no v prefix, eg. 0.4.0).'
+        default: "0.4.0"
         required: true
 
 permissions:
   contents: write
   pull-requests: write
 
+env:
+  GH_TOKEN: ${{ github.token }}
+
 jobs:
   run-equivalence-tests:
     name: "Run equivalence tests"
diff --git a/.github/workflows/equivalence-test-update.yml b/.github/workflows/equivalence-test-update.yml
index 988fbf94d9b2..893669decd84 100644
--- a/.github/workflows/equivalence-test-update.yml
+++ b/.github/workflows/equivalence-test-update.yml
@@ -8,6 +8,9 @@ permissions:
   contents: write
   pull-requests: write
 
+env:
+  GH_TOKEN: ${{ github.token }}
+
 jobs:
   check:
     name: "Should run equivalence tests?"
@@ -18,14 +21,14 @@ jobs:
       - name: target_branch
         id: target_branch
         run: |
-          merged = ${{ github.event.pull_request.merged }}
-          target_branch = ${{ github.event.pull_request.base.ref }}
+          merged="${{ github.event.pull_request.merged }}"
+          target_branch="${{ github.event.pull_request.base.ref }}"
           
-          targets_release_branch = false
+          targets_release_branch=false
           if [ "$target_branch" == "main" ]; then
-            targets_release_branch = true
+            targets_release_branch=true
           elif [ "$target_branch" =~ ^v[0-9]+\.[0-9]+$ ]; then
-            targets_release_branch = true
+            targets_release_branch=true
           fi
           
           should_run=false
@@ -57,7 +60,7 @@ jobs:
 
       - uses: ./.github/actions/equivalence-test
         with:
-          target-equivalence-test-version: ${{ inputs.equivalence-test-version }}
+          target-equivalence-test-version: 0.4.0
           target-os: linux
           target-arch: amd64
           current-branch: ${{ github.event.pull_request.base.ref }}