diff --git a/.vsts-ci-richnav.yml b/.vsts-ci-richnav.yml
index e78a8d02cf48..4b82e4c1e211 100644
--- a/.vsts-ci-richnav.yml
+++ b/.vsts-ci-richnav.yml
@@ -52,7 +52,12 @@ stages:
           - _SignArgs: ''
           - _InternalRuntimeDownloadArgs: ''
         steps:
-        - script: eng\CIBuild.cmd
+        - powershell: eng\common\build.ps1
+                    -restore
+                    -ci
+                    -build
+                    -pack
+                    -sign
                     -configuration $(_BuildConfig)
                     $(_PublishArgs)
                     $(_SignArgs)
diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 623fca90b0f7..8f1aad2901e4 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -18,6 +18,8 @@ variables:
     value: Roslyn-Project-System
   - name: _DotNetPublishToBlobFeed
     value: false
+  - name: _CIBuild
+    value: -restore -build -sign -pack -ci
   - name: _DotNetArtifactsCategory
     value: .NETCore
   - name: _DotNetValidationArtifactsCategory
diff --git a/eng/CIBuild.cmd b/eng/CIBuild.cmd
deleted file mode 100644
index 5bb05a4c5ed6..000000000000
--- a/eng/CIBuild.cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off
-powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0common\Build.ps1""" -restore -build -sign -pack -ci %*"
\ No newline at end of file
diff --git a/eng/build.yml b/eng/build.yml
index f144a5626d15..d84e640811ed 100644
--- a/eng/build.yml
+++ b/eng/build.yml
@@ -67,7 +67,8 @@ jobs:
           env:
             Token: $(dn-bot-dnceng-artifact-feeds-rw)
       - ${{ if eq(parameters.agentOs, 'Windows_NT') }}:
-        - script: eng\CIBuild.cmd
+        - powershell: eng\common\build.ps1
+                    $(_CIBuild)
                     -configuration $(_BuildConfig)
                     $(_PublishArgs)
                     $(_SignArgs)
@@ -98,7 +99,8 @@ jobs:
               RunAoTTests: 'false'
   
       - ${{ if eq(parameters.agentOs, 'Windows_NT_FullFramework') }}:
-        - script: eng\CIBuild.cmd
+        - powershell: eng\common\build.ps1
+                    $(_CIBuild)
                     -configuration $(_BuildConfig)
                     $(_SignArgs)
                     $(_OfficialBuildIdArgs)
@@ -128,11 +130,11 @@ jobs:
               HelixAccessToken: $(_HelixApiToken)
   
       - ${{ if eq(parameters.agentOs, 'Windows_NT_TestAsTools') }}:
-        - script: eng\CIBuild.cmd
+        - powershell: eng\common\build.ps1
+                    $(_CIBuild)
                     -configuration $(_BuildConfig)
                     $(_SignArgs)
                     $(_OfficialBuildIdArgs)
-                    $(_Test)
                     $(_InternalRuntimeDownloadArgs)
                     /p:RunTestsAsTool=true
           displayName: Build
@@ -140,7 +142,8 @@ jobs:
             BuildConfig: $(_BuildConfig)
   
       - ${{ if notIn(parameters.agentOs, 'Windows_NT', 'Windows_NT_FullFramework', 'Windows_NT_TestAsTools') }}:
-        - script: eng/common/cibuild.sh
+        - script: eng/common/build.sh
+                    $(_CIBuild)
                     --configuration $(_BuildConfig)
                     $(_SignArgs)
                     $(_OfficialBuildIdArgs)
@@ -241,7 +244,8 @@ jobs:
           env:
             Token: $(dn-bot-dnceng-artifact-feeds-rw)
       - ${{ if eq(parameters.agentOs, 'Windows_NT') }}:
-        - script: eng\CIBuild.cmd
+        - powershell: eng\common\build.ps1
+                    $(_CIBuild)
                     -configuration $(_BuildConfig)
                     $(_SignArgs)
                     $(_OfficialBuildIdArgs)
@@ -368,7 +372,8 @@ jobs:
           env:
             Token: $(dn-bot-dnceng-artifact-feeds-rw)
       - ${{ if contains(parameters.agentOs, 'Windows_NT') }}:
-        - script: eng\CIBuild.cmd
+        - powershell: eng\common\build.ps1
+                    $(_CIBuild)
                     -configuration $(_BuildConfig)
                     $(_SignArgs)
                     $(_OfficialBuildIdArgs)