diff --git a/goma_auth b/goma_auth
index 827af3556..ba6b907aa 100755
--- a/goma_auth
+++ b/goma_auth
@@ -11,4 +11,4 @@ MYPATH=$(dirname "${BASH_SOURCE[0]}")
 source "$MYPATH/cipd_bin_setup.sh"
 cipd_bin_setup &> /dev/null
 
-PYTHONDONTWRITEBYTECODE=1 exec python3 "$MYPATH/.cipd_bin/goma_auth.py" "$@"
+PYTHONDONTWRITEBYTECODE=1 exec python "$MYPATH/.cipd_bin/goma_auth.py" "$@"
diff --git a/goma_auth.bat b/goma_auth.bat
index d92207c36..26dfe960b 100644
--- a/goma_auth.bat
+++ b/goma_auth.bat
@@ -6,5 +6,5 @@
 :: See revert instructions in cipd_manifest.txt
 
 @call "%~dp0\cipd_bin_setup.bat" > nul 2>&1
-@call %scriptdir%python-bin\python3.bat %~dp0\.cipd_bin\goma_auth.py %*
+@call python.bat %~dp0\.cipd_bin\goma_auth.py %*
 exit /b
diff --git a/goma_ctl b/goma_ctl
index f4514ed49..5dd43e4a8 100755
--- a/goma_ctl
+++ b/goma_ctl
@@ -11,4 +11,4 @@ MYPATH=$(dirname "${BASH_SOURCE[0]}")
 source "$MYPATH/cipd_bin_setup.sh"
 cipd_bin_setup &> /dev/null
 
-PYTHONDONTWRITEBYTECODE=1 exec python3 "$MYPATH/.cipd_bin/goma_ctl.py" "$@"
+PYTHONDONTWRITEBYTECODE=1 exec python "$MYPATH/.cipd_bin/goma_ctl.py" "$@"
diff --git a/goma_ctl.bat b/goma_ctl.bat
index 5036d902e..8f7819039 100644
--- a/goma_ctl.bat
+++ b/goma_ctl.bat
@@ -6,5 +6,5 @@
 :: See revert instructions in cipd_manifest.txt
 
 @call "%~dp0\cipd_bin_setup.bat" > nul 2>&1
-@call %scriptdir%python-bin\python3.bat %~dp0\.cipd_bin\goma_ctl.py %*
+@call vpython.bat %~dp0\.cipd_bin\goma_ctl.py %*
 exit /b