diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
index fc13883698b..7bafb20973d 100644
--- a/.github/workflows/Build.yml
+++ b/.github/workflows/Build.yml
@@ -5,7 +5,7 @@ on: [push]
 jobs:
   BuildDebug:
 
-    runs-on: windows-latest
+    runs-on: [self-hosted, VSPreview]
 
     steps:
     - uses: actions/checkout@v1
@@ -15,27 +15,26 @@ jobs:
     #     nuget-version: '5.x'
     - name: Build
       run: .\build.cmd -pack -ci -configuration Debug -prepareMachine /p:Platform=x86
-    # - name: Push
-    #   uses: actions/upload-artifact@v1
-    #   with:
-    #     name: WPF_Debug
-    #     path: ./artifacts/packages/Debug/NonShipping
-    - name: Debug
-      run: Get-ChildItem -Path "." -Recurse
-  # BuildRelease:
+    - name: Build CustomWPF
+      run: dotnet build CustomWpf
+    - name: Push
+      uses: actions/upload-artifact@v1
+      with:
+        name: WPF_Debug
+        path: ./artifacts/packages/Debug/NonShipping
+
+  BuildRelease:
 
-  #   runs-on: windows-latest
+    runs-on: [self-hosted, VSPreview]
 
-  #   steps:
-  #   - uses: actions/checkout@v1
-  #   # - name: Install Nuget
-  #   #   uses: nuget/setup-nuget@v1
-  #   #   with:
-  #   #     nuget-version: '5.x'
-  #   - name: Build
-  #     run: .\build.cmd -pack -ci -configuration Release -prepareMachine /p:Platform=x86
-  #   - name: Push
-  #     uses: actions/upload-artifact@v1
-  #     with:
-  #       name: WPF_Release
-  #       path: ./artifacts/packages/Release/NonShipping
\ No newline at end of file
+    steps:
+    - uses: actions/checkout@v1
+    - name: Build
+      run: .\build.cmd -pack -ci -configuration Release -prepareMachine /p:Platform=x86
+    - name: Build CustomWPF
+      run: dotnet build CustomWpf -c Release
+    - name: Push
+      uses: actions/upload-artifact@v1
+      with:
+        name: WPF_Release
+        path: ./artifacts/packages/Release/NonShipping
\ No newline at end of file