diff --git a/builders/org.python.pydev.build/build_cmd.bat b/builders/org.python.pydev.build/build_cmd.bat
index a1a5379466..4520e3ed52 100644
--- a/builders/org.python.pydev.build/build_cmd.bat
+++ b/builders/org.python.pydev.build/build_cmd.bat
@@ -64,8 +64,8 @@ git submodule update --init --recursive
 
 @echo Create builtin modules
 set PYTHONPATH=%BUILD_DIR%/Pydev/plugins/org.python.pydev.core/pysrc
-C:\bin\Python38-32\python %BUILD_DIR%/Pydev/plugins/org.python.pydev.core/pysrc/build_tools/build.py
-C:\bin\Python38-32\python %BUILD_DIR%/Pydev/plugins/org.python.pydev.core/pysrc/build_tools/build_binaries_windows.py
+C:\bin\Miniconda\envs\py_38_tests\python.exe %BUILD_DIR%/Pydev/plugins/org.python.pydev.core/pysrc/build_tools/build.py
+C:\bin\Miniconda\envs\py_38_tests\python.exe %BUILD_DIR%/Pydev/plugins/org.python.pydev.core/pysrc/build_tools/build_binaries_windows.py
 
 @echo to clean after the build: -DcleanAfter.set=true
 mvn install
diff --git a/plugins/org.python.pydev.core/pysrc/build_tools/pydevd_release_process.txt b/plugins/org.python.pydev.core/pysrc/build_tools/pydevd_release_process.txt
index c19fc4e744..313a4e2061 100644
--- a/plugins/org.python.pydev.core/pysrc/build_tools/pydevd_release_process.txt
+++ b/plugins/org.python.pydev.core/pysrc/build_tools/pydevd_release_process.txt
@@ -79,7 +79,7 @@ conda deactivate
 4. Regenerate the .pyx and .c
 ===============================
 
-"C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvars64.bat"
+set FORCE_PYDEVD_VC_VARS=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvars64.bat
 cd /D x:\pydev\plugins\org.python.pydev.core\pysrc
 set PYTHONPATH=x:\pydev\plugins\org.python.pydev.core\pysrc
 C:\bin\Miniconda\envs\py_38_tests\python.exe build_tools\build.py