diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ab64c9f19..abddfcf5b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -213,7 +213,7 @@ jobs:
     strategy:
       fail-fast: false # prevent one matrix pipeline from being cancelled if one fails, we want them all to run to completion.
       matrix:
-        winui: [2, 3]
+        winui: [0, 2, 3]
 
     env:
       VERSION_PROPERTY: ${{ github.ref == 'refs/heads/main' && format('build.{0}', github.run_number) || format('pull-{0}.{1}', github.event.number, github.run_number) }}
@@ -256,20 +256,10 @@ jobs:
         uses: microsoft/setup-msbuild@v2
         with:
           vs-version: '[17.9,)'
-
-      - name: Define excluded MultiTargets (WinUI 2)
-        if: ${{ matrix.winui == '2' }}
-        run: |
-          echo "EXCLUDED_MULTITARGETS=wasdk" >> $env:GITHUB_ENV
-
-      - name: Define excluded MultiTargets (WinUI 3)
-        if: ${{ matrix.winui == '3' }}
-        run: |
-          echo "EXCLUDED_MULTITARGETS=uwp" >> $env:GITHUB_ENV
           
       # Build and pack component nupkg
       - name: Build and pack component packages
-        run: ./tooling/Build-Toolkit-Components.ps1 -MultiTargets all -ExcludeMultiTargets ${{ env.EXCLUDED_MULTITARGETS }} -WinUIMajorVersion ${{ matrix.winui }} -DateForVersion ${{ env.VERSION_DATE }} ${{ env.VERSION_PROPERTY != '' && format('-PreviewVersion "{0}"', env.VERSION_PROPERTY) || '' }} ${{ env.ENABLE_DIAGNOSTICS == 'true' && '-EnableBinlogs' || '' }} ${{ env.ENABLE_DIAGNOSTICS == 'true' && '-Verbose' || '' }} -BinlogOutput ./ -NupkgOutput ./ -Release
+        run: ./tooling/Build-Toolkit-Components.ps1 -MultiTargets all -WinUIMajorVersion ${{ matrix.winui }} -DateForVersion ${{ env.VERSION_DATE }} ${{ env.VERSION_PROPERTY != '' && format('-PreviewVersion "{0}"', env.VERSION_PROPERTY) || '' }} ${{ env.ENABLE_DIAGNOSTICS == 'true' && '-EnableBinlogs' || '' }} ${{ env.ENABLE_DIAGNOSTICS == 'true' && '-Verbose' || '' }} -BinlogOutput ./ -NupkgOutput ./ -Release
 
       - name: Validate package names
         if: ${{ env.VERSION_PROPERTY != '' }}
diff --git a/tooling b/tooling
index 060d80527..0054ba3a3 160000
--- a/tooling
+++ b/tooling
@@ -1 +1 @@
-Subproject commit 060d805274044bfacc2ba54d68dc452f1ce601dc
+Subproject commit 0054ba3a32038f1b2aa0834ab8dfbdf98a8eefaa