diff --git a/.yamato/windows-build.yml b/.yamato/windows-build.yml
index f36cf7d..f5f6b35 100644
--- a/.yamato/windows-build.yml
+++ b/.yamato/windows-build.yml
@@ -1,7 +1,7 @@
 name: Win - Build & Test VCS plugins
 agent:
     type: Unity::VM
-    image: core-kaunas/win10-vs2010:latest
+    image: vcs-ecosystem/win10-vs2019-perforce-plugin:latest
     flavor: b1.large
     
 interpreter: powershell    
@@ -18,4 +18,4 @@ artifacts:
     logs:
       paths:
         - "win_build.txt"
-        - "win_test.txt"
\ No newline at end of file
+        - "win_test.txt"
diff --git a/msbuilder.cmd b/msbuilder.cmd
index 6fbe9ac..c97f489 100644
--- a/msbuilder.cmd
+++ b/msbuilder.cmd
@@ -1,4 +1,4 @@
-if exist "%PROGRAMFILES%\Microsoft Visual Studio 10.0\Common7\Tools\vsvars32.bat" call "%PROGRAMFILES%\Microsoft Visual Studio 10.0\Common7\Tools\vsvars32.bat"
-if exist "%ProgramFiles(x86)%\Microsoft Visual Studio 10.0\Common7\Tools\vsvars32.bat" call "%ProgramFiles(x86)%\Microsoft Visual Studio 10.0\Common7\Tools\vsvars32.bat"
-if exist "%REALVSPATH%\Common7\Tools\vsvars32.bat" call "%REALVSPATH%\Common7\Tools\vsvars32.bat"
+if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\VsMSBuildCmd.bat" call "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\VsMSBuildCmd.bat"
+if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\Common7\Tools\VsMSBuildCmd.bat" call "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\Common7\Tools\VsMSBuildCmd.bat"
+
 call msbuild %1 /t:Clean;%2 /p:Configuration=Release;Platform=%3