diff --git a/build.cmd b/build.cmd
index 275100b8..aaccc7a4 100644
--- a/build.cmd
+++ b/build.cmd
@@ -1,3 +1,3 @@
 @ECHO OFF
-powershell.exe -NoLogo -NoProfile -ExecutionPolicy ByPass -Command "& """%~dp0scripts\build.ps1""" -build %*"
+pwsh.exe -NoLogo -NoProfile -ExecutionPolicy ByPass -Command "& """%~dp0scripts\build.ps1""" -build %*"
 EXIT /B %ERRORLEVEL%
diff --git a/pack.cmd b/pack.cmd
index 0d155871..96029f75 100644
--- a/pack.cmd
+++ b/pack.cmd
@@ -1,3 +1,3 @@
 @ECHO OFF
-powershell.exe -NoLogo -NoProfile -ExecutionPolicy ByPass -Command "& """%~dp0scripts\build.ps1""" -pack %*"
+pwsh.exe -NoLogo -NoProfile -ExecutionPolicy ByPass -Command "& """%~dp0scripts\build.ps1""" -pack %*"
 EXIT /B %ERRORLEVEL%
diff --git a/restore.cmd b/restore.cmd
index eeaa085f..3114fe44 100644
--- a/restore.cmd
+++ b/restore.cmd
@@ -1,3 +1,3 @@
 @ECHO OFF
-powershell.exe -NoLogo -NoProfile -ExecutionPolicy ByPass -Command "& """%~dp0scripts\build.ps1""" -restore %*"
+pwsh.exe -NoLogo -NoProfile -ExecutionPolicy ByPass -Command "& """%~dp0scripts\build.ps1""" -restore %*"
 EXIT /B %ERRORLEVEL%
diff --git a/scripts/build.ps1 b/scripts/build.ps1
index ed944f9e..0d473013 100644
--- a/scripts/build.ps1
+++ b/scripts/build.ps1
@@ -103,25 +103,25 @@ function Test-Win32Metadata {
     $clangSharpPInvokeGeneratorBinaries = (Get-ChildItem -Path "$clangSharpPInvokeGeneratorOutputDir" -File).FullName
     Copy-Item -Path $clangSharpPInvokeGeneratorBinaries -Destination "$win32MetadataToolsDir"
 
-    $generateMetadataSourceCmd = Join-Path -Path $win32MetadataDir -ChildPath "GenerateMetadataSource.cmd"
-    & "$generateMetadataSourceCmd"
+    $generateMetadataSourcePs1 = Join-Path -Path $win32MetadataDir -ChildPath "scripts\GenerateMetadataSource.ps1"
+    & "$generateMetadataSourcePs1"
 
     if ($LastExitCode -ne 0) {
-      throw "'GenerateMetadataSource.cmd' failed"
+      throw "'GenerateMetadataSource.ps1' failed"
     }
 
-    $buildMetadataBinCmd = Join-Path -Path $win32MetadataDir -ChildPath "BuildMetadataBin.cmd"
-    & "$buildMetadataBinCmd"
+    $buildMetadataBinPs1 = Join-Path -Path $win32MetadataDir -ChildPath "scripts\BuildMetadataBin.ps1"
+    & "$buildMetadataBinPs1"
 
     if ($LastExitCode -ne 0) {
-      throw "'BuildMetadataBin.cmd' failed"
+      throw "'BuildMetadataBin.ps1' failed"
     }
 
-    $testMetdataBinCmd = Join-Path -Path $win32MetadataDir -ChildPath "TestMetadataBin.cmd"
-    & "$testMetdataBinCmd"
+    $testWinmdBinaryPs1 = Join-Path -Path $win32MetadataDir -ChildPath "scripts\TestWinmdBinary.ps1"
+    & "$testWinmdBinaryPs1"
 
     if ($LastExitCode -ne 0) {
-      throw "'TestMetadataBin.cmd' failed"
+      throw "'TestWinmdBinary.ps1' failed"
     }
   }
   finally {
diff --git a/scripts/cibuild.cmd b/scripts/cibuild.cmd
index cca9bbe4..083f4540 100644
--- a/scripts/cibuild.cmd
+++ b/scripts/cibuild.cmd
@@ -1,3 +1,3 @@
 @ECHO OFF
-powershell.exe -NoLogo -NoProfile -ExecutionPolicy ByPass -Command "& """%~dp0build.ps1""" -ci %*"
+pwsh.exe -NoLogo -NoProfile -ExecutionPolicy ByPass -Command "& """%~dp0build.ps1""" -ci %*"
 EXIT /B %ERRORLEVEL%
diff --git a/test.cmd b/test.cmd
index 003d34a8..24080884 100644
--- a/test.cmd
+++ b/test.cmd
@@ -1,3 +1,3 @@
 @ECHO OFF
-powershell.exe -NoLogo -NoProfile -ExecutionPolicy ByPass -Command "& """%~dp0scripts\build.ps1""" -test %*"
+pwsh.exe -NoLogo -NoProfile -ExecutionPolicy ByPass -Command "& """%~dp0scripts\build.ps1""" -test %*"
 EXIT /B %ERRORLEVEL%