diff --git a/scripts/buildkite/sample_build.py b/scripts/buildkite/sample_build.py
index ac5d498..672f89c 100644
--- a/scripts/buildkite/sample_build.py
+++ b/scripts/buildkite/sample_build.py
@@ -14,12 +14,13 @@ if __name__ == '__main__':
       'branch': 'main',
       'commit': '20ba079dda7be1a72d64cebc9f55d909bf29f6c1',
       'env': {
-          #'ph_skip_linux': 'skip',
+          'ph_skip_linux': 'skip',
           'ph_skip_generated': 'skip',
           'ph_log_level': 'DEBUG',
           # 'ph_skip_windows': 'skip',
           'ph_linux_agents': '{"queue": "linux-test"}',
-          'ph_windows_agents': f'{{"queue": "windows-test"}}',
+          'ph_windows_agents': f'{{"name": "win-dev", "queue": "windows-test"}}',
+          'ph_scripts_refspec': 'windows-vscmd',
       }})
   print(d)
   if (args.dryrun):
diff --git a/scripts/steps.py b/scripts/steps.py
index d7e7598..b9f212f 100644
--- a/scripts/steps.py
+++ b/scripts/steps.py
@@ -131,6 +131,7 @@ def generic_windows(projects: str) -> List:
         'commands': [
             clear_sccache if no_cache else '',
             'sccache --zero-stats',
+            'C:\\BuildTools\\Common7\\Tools\\VsDevCmd.bat -arch=amd64 -host_arch=amd64',
             *checkout_scripts('windows', scripts_refspec),
             'pip install -q -r ./mlir/python/requirements.txt',
             'powershell -command "'