diff --git a/.github/workflows/merge-bot-pull-request.yml b/.github/workflows/merge-bot-pull-request.yml
index 615ed525..e62689d5 100644
--- a/.github/workflows/merge-bot-pull-request.yml
+++ b/.github/workflows/merge-bot-pull-request.yml
@@ -27,7 +27,7 @@ jobs:
 
       - name: Merge pull request step
         if: steps.metadata.outputs.update-type != 'version-update:semver-major'
-        run: gh pr merge --auto --merge "$PR_URL"
+        run: gh pr merge --auto --squash "$PR_URL"
         env:
           PR_URL: ${{github.event.pull_request.html_url}}
           GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
@@ -43,7 +43,7 @@ jobs:
     steps:
 
       - name: Merge pull request step
-        run: gh pr merge --auto --merge "$PR_URL"
+        run: gh pr merge --auto --squash "$PR_URL"
         env:
           PR_URL: ${{github.event.pull_request.html_url}}
           GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
diff --git a/.github/workflows/run-codegen-pull-request-task.yml b/.github/workflows/run-codegen-pull-request-task.yml
index 65d1c647..f096053d 100644
--- a/.github/workflows/run-codegen-pull-request-task.yml
+++ b/.github/workflows/run-codegen-pull-request-task.yml
@@ -1,8 +1,5 @@
 name: Run codegen and pull request task
 
-env:
-  PROJECT_FILE: ./CodeGen/CodeGen.csproj
-
 on:
   workflow_call:
 
@@ -24,7 +21,7 @@ jobs:
 
       - name: Run codegen step
         run: >-
-            dotnet run --project ${{ env.PROJECT_FILE }} --
+          dotnet run --project ./CodeGen/CodeGen.csproj --
             --codepath ./CodeGen
 
       - name: Format code step
@@ -42,3 +39,4 @@ jobs:
           body: 'This PR updates the codegen files.'
           commit-message: 'Update codegen files'
           delete-branch: true
+          sign-commits: true