diff --git a/goma_auth b/goma_auth
index ba6b907aa..52d569776 100755
--- a/goma_auth
+++ b/goma_auth
@@ -6,9 +6,15 @@
 
 # See revert instructions in cipd_manifest.txt
 
+# In git bash on Windows, invoke the batch file.
+if [ "$(expr "$(uname -s)" : "^MINGW64_NT")" == "10" ]; then
+    goma_auth.bat "$@"
+    exit
+fi
+
 MYPATH=$(dirname "${BASH_SOURCE[0]}")
 
 source "$MYPATH/cipd_bin_setup.sh"
 cipd_bin_setup &> /dev/null
 
-PYTHONDONTWRITEBYTECODE=1 exec python "$MYPATH/.cipd_bin/goma_auth.py" "$@"
+PYTHONDONTWRITEBYTECODE=1 exec python3 "$MYPATH/.cipd_bin/goma_auth.py" "$@"
diff --git a/goma_auth.bat b/goma_auth.bat
index 26dfe960b..82a5974db 100644
--- a/goma_auth.bat
+++ b/goma_auth.bat
@@ -5,6 +5,8 @@
 
 :: See revert instructions in cipd_manifest.txt
 
+set scriptdir=%~dp0
+
 @call "%~dp0\cipd_bin_setup.bat" > nul 2>&1
-@call python.bat %~dp0\.cipd_bin\goma_auth.py %*
+@call %scriptdir%python-bin\python3.bat %~dp0\.cipd_bin\goma_auth.py %*
 exit /b
diff --git a/goma_ctl b/goma_ctl
index 5dd43e4a8..b3c6547c7 100755
--- a/goma_ctl
+++ b/goma_ctl
@@ -6,9 +6,15 @@
 
 # See revert instructions in cipd_manifest.txt
 
+# In git bash on Windows, invoke the batch file.
+if [ "$(expr "$(uname -s)" : "^MINGW64_NT")" == "10" ]; then
+    goma_ctl.bat "$@"
+    exit
+fi
+
 MYPATH=$(dirname "${BASH_SOURCE[0]}")
 
 source "$MYPATH/cipd_bin_setup.sh"
 cipd_bin_setup &> /dev/null
 
-PYTHONDONTWRITEBYTECODE=1 exec python "$MYPATH/.cipd_bin/goma_ctl.py" "$@"
+PYTHONDONTWRITEBYTECODE=1 exec python3 "$MYPATH/.cipd_bin/goma_ctl.py" "$@"
diff --git a/goma_ctl.bat b/goma_ctl.bat
index 8f7819039..63c410b60 100644
--- a/goma_ctl.bat
+++ b/goma_ctl.bat
@@ -5,6 +5,8 @@
 
 :: See revert instructions in cipd_manifest.txt
 
+set scriptdir=%~dp0
+
 @call "%~dp0\cipd_bin_setup.bat" > nul 2>&1
-@call vpython.bat %~dp0\.cipd_bin\goma_ctl.py %*
+@call %scriptdir%python-bin\python3.bat %~dp0\.cipd_bin\goma_ctl.py %*
 exit /b