diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 215c9e8..19ab843 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -33,6 +33,9 @@ jobs:
         run: ./bin/init.sh
         shell: bash
 
+      - name: Install pigz
+        run: curl -sSfLo c:\windows\system32\unpigz.exe https://kjkpub.s3.amazonaws.com/software/pigz/2.3.1-149/unpigz.exe
+
       # ignore not yet existing images
       - name: Fetch the docker images
         run: |
@@ -41,18 +44,14 @@ jobs:
           docker pull ${{ env.IMAGE }}:${{ env.VERSION }}-${{ env.TAG }}
         continue-on-error: true
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1.5.1
+        with:
+          version: latest
+          driver: docker
+
       - name: Build the docker image
-        run: |
-          docker build --progress plain \
-            -t ${{ env.IMAGE }}:${{ env.TAG }} \
-            -t ${{ env.IMAGE }}:${{ env.VERSION }}-${{ env.TAG }} \
-            --cache-from ${{ env.IMAGE }} \
-            --cache-from ${{ env.IMAGE }}:${{ env.TAG }} \
-            --cache-from ${{ env.IMAGE }}:${{ env.VERSION }}-${{ env.TAG }} \
-            -f Dockerfile.${{ env.BASE }} \
-            .
-        working-directory: ./windows
-        shell: bash
+        run: docker buildx bake --progress plain test
 
       - name: Test run
         run:  docker-compose --file docker-compose.test.yml run sut
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 9981e31..a81d0df 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -12,6 +12,10 @@ variable "VERSION" {
   default = ""
 }
 
+variable "SYSTEM" {
+  default = "linux"
+}
+
 group "default" {
   targets = ["build_ghcr", "build_docker"]
 }
@@ -29,7 +33,7 @@ group "test" {
 }
 
 target "settings" {
-  context    = "./linux"
+  context    = "./${SYSTEM}"
   inherits   = ["settings"]
   cache-from = ["type=registry,ref=ghcr.io/${OWNER}/cache:${FILE}-${TAG}"]
 }