diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
index def27c9..c0d8f7a 100644
--- a/.github/workflows/msbuild.yml
+++ b/.github/workflows/msbuild.yml
@@ -1,19 +1,13 @@
 name: MSBuild
 
 on:
-  workflow_call:
-    inputs:
-      branch:
-        required: true
-        type: string
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
 
 env:
-  # Path to the solution file relative to the root of the project.
   SOLUTION_FILE_PATH: .
-
-  # Configuration type to build.
-  # You can convert this to a build matrix if you need coverage of multiple configuration types.
-  # https://docs.github.com/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
   BUILD_CONFIGURATION: Release
 
 permissions:
@@ -25,8 +19,6 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-      with:
-        ref: ${{ inputs.branch }}
 
     - name: Add MSBuild to PATH
       uses: microsoft/setup-msbuild@v1.0.2
@@ -35,16 +27,26 @@ jobs:
       working-directory: ${{env.GITHUB_WORKSPACE}}
       run: nuget restore ${{env.SOLUTION_FILE_PATH}}
 
-    - name: Build
+    - name: Build Reboot
       working-directory: ${{env.GITHUB_WORKSPACE}}
-      # Add additional options to the MSBuild command line here (like platform or verbosity level).
-      # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
-      run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}}
-
-    - name: Upload Release Artifact
+      run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:DefineConstants="" ${{env.SOLUTION_FILE_PATH}}
+      
+    - name: Upload Artifact without ABOVE_S20
       uses: actions/upload-artifact@v3
       with:
-        name: Release
+        name: Reboot
+        path: ${{env.SOLUTION_FILE_PATH}}/x64/Release
+        if-no-files-found: warn
+        retention-days: 60
+
+    - name: Build RebootS20
+      working-directory: ${{env.GITHUB_WORKSPACE}}
+      run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:DefineConstants="ABOVE_S20" ${{env.SOLUTION_FILE_PATH}}
+
+    - name: Upload Artifact with ABOVE_S20
+      uses: actions/upload-artifact@v3
+      with:
+        name: RebootS20
         path: ${{env.SOLUTION_FILE_PATH}}/x64/Release
         if-no-files-found: warn
         retention-days: 60