diff --git a/scripts/git/google_to_main.sh b/scripts/git/google_to_main.sh
index ec20185..a424cb9 100755
--- a/scripts/git/google_to_main.sh
+++ b/scripts/git/google_to_main.sh
@@ -49,6 +49,9 @@
   exit 1
 fi
 
-# Workaround https://github.com/cli/cli/issues/1820
-GITHUB_USERNAME="$(gh config get -h github.com user)"
-gh pr create --base main --head="${GITHUB_USERNAME?}:${PR_BRANCH?}" --title="${TITLE?}" --body="${BODY?}"
+# Extract the GitHub owner of the fork from either an ssh or https GitHub URL.
+# Workaround for https://github.com/cli/cli/issues/1820,
+# https://github.com/cli/cli/issues/1985, and
+# https://github.com/cli/cli/issues/575
+FORK_NAME="$(git remote get-url ${FORK_REMOTE?} | sed 's|.*[/:]\([A-Za-z]*\)/iree\(.git\)\?|\1|')"
+gh pr create --base main --head="${FORK_NAME?}:${PR_BRANCH?}" --title="${TITLE?}" --body="${BODY?}"
diff --git a/scripts/git/main_to_google.sh b/scripts/git/main_to_google.sh
index 571adea..720c5d8 100755
--- a/scripts/git/main_to_google.sh
+++ b/scripts/git/main_to_google.sh
@@ -49,6 +49,9 @@
   exit 1
 fi
 
-# Workaround https://github.com/cli/cli/issues/1820
-GITHUB_USERNAME="$(gh config get -h github.com user)"
-gh pr create --base google --head="${GITHUB_USERNAME?}:${PR_BRANCH?}" --title="${TITLE?}" --body="${BODY?}"
+# Extract the GitHub owner of the fork from either an ssh or https GitHub URL.
+# Workaround for https://github.com/cli/cli/issues/1820,
+# https://github.com/cli/cli/issues/1985, and
+# https://github.com/cli/cli/issues/575
+FORK_NAME="$(git remote get-url ${FORK_REMOTE?} | sed 's|.*[/:]\([A-Za-z]*\)/iree\(.git\)\?|\1|')"
+gh pr create --base google --head="${FORK_NAME?}:${PR_BRANCH?}" --title="${TITLE?}" --body="${BODY?}"
diff --git a/scripts/git/update_llvm_dependent_submodules.sh b/scripts/git/update_llvm_dependent_submodules.sh
index 63bd048..ee8feb5 100755
--- a/scripts/git/update_llvm_dependent_submodules.sh
+++ b/scripts/git/update_llvm_dependent_submodules.sh
@@ -65,5 +65,8 @@
 fi
 
 # Extract the GitHub owner of the fork from either an ssh or https GitHub URL.
+# Workaround for https://github.com/cli/cli/issues/1820,
+# https://github.com/cli/cli/issues/1985, and
+# https://github.com/cli/cli/issues/575
 FORK_NAME="$(git remote get-url ${FORK_REMOTE?} | sed 's|.*[/:]\([A-Za-z]*\)/iree\(.git\)\?|\1|')"
 gh pr create --base="${BASE_BRANCH?}" --head="${FORK_NAME?}:${PR_BRANCH?}" --title="${TITLE?}" --body="${BODY?}"