diff --git a/.github/workflows/on-trigger.yml b/.github/workflows/on-trigger.yml
index 5c2fb44103..d60fbb8312 100644
--- a/.github/workflows/on-trigger.yml
+++ b/.github/workflows/on-trigger.yml
@@ -63,7 +63,7 @@ jobs:
     uses: ./.github/workflows/reusable-check-missing-commits.yml
 
   check-single-commit:
-    if: ${{ github.event_name == 'merge_group' }}
+    if: ${{ github.event_name == 'push' }}
     uses: ./.github/workflows/reusable-check-commit-message.yml
 
   build-test:
diff --git a/bin/git/squash-commits.sh b/bin/git/squash-commits.sh
index 55a2825422..1aeacc6a15 100644
--- a/bin/git/squash-commits.sh
+++ b/bin/git/squash-commits.sh
@@ -81,7 +81,7 @@ owner=$(gh pr view --json "headRepositoryOwner" --jq '.headRepositoryOwner.login
 user=$(gh api user --jq '.login')
 echo "The PR is owned by '${owner}'. The current user is '${user}'."
 if [ "${owner}" = 'XRPLF' ] || [ "${owner}" = "${user}" ]; then
-  remote="origin"
+  remote="$(git remote -v | grep 'XRPLF/rippled.git (push)' | cut -f1)"
 else
   remote="${owner}"
 fi