diff --git a/tools/regz/.buildkite/pipeline.yml b/tools/regz/.buildkite/pipeline.yml
index e454e7b..790f20b 100644
--- a/tools/regz/.buildkite/pipeline.yml
+++ b/tools/regz/.buildkite/pipeline.yml
@@ -1,3 +1,23 @@
 steps:
-  - label: Build and Test
-    command: zig build test
+  - group: Build and Test
+    steps:
+    - command: zig build test
+
+
+  - group: Crosscompile
+    steps:
+    - label: "Target: {{matrix.target}} :zap:"
+      command: "zig build -Dtarget={{matrix.target}}"
+      matrix:
+        setup:
+          target:
+          - "aarch64-linux-gnu"
+          - "aarch64-linux-musl"
+          - "aarch64-macos"
+          - "i386-linux-gnu"
+          - "i386-linux-musl"
+          - "i386-windows"
+          - "x86_64-linux-gnu"
+          - "x86_64-linux-musl"
+          - "x86_64-macos"
+          - "x86_64-windows-gnu"
diff --git a/tools/regz/.github/workflows/ci.yml b/tools/regz/.github/workflows/ci.yml
index 9049f7f..89d3e44 100644
--- a/tools/regz/.github/workflows/ci.yml
+++ b/tools/regz/.github/workflows/ci.yml
@@ -8,56 +8,11 @@ on:
     - cron: "0 7 * * *"
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        target: [
-          #riscv64-linux-gnu,
-          #riscv64-linux-musl,
-          aarch64-linux-gnu,
-          aarch64-linux-musl,
-          aarch64-macos,
-          i386-linux-gnu,
-          i386-linux-musl,
-          i386-windows,
-          x86_64-linux-gnu,
-          x86_64-linux-musl,
-          x86_64-macos,
-          x86_64-windows-gnu,
-        ]
-        mode: [
-          debug,
-          release-safe,
-          release-fast,
-          release-small,
-        ]
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-      with:
-        submodules: recursive
-        fetch-depth: 0
-
-    - name: Setup Zig
-      uses: goto-bus-stop/setup-zig@v1.3.0
-      with:
-        version: master
-
-    - name: Build Debug
-      if: ${{ matrix.mode == 'debug' }}
-      run: zig build -Dtarget=${{ matrix.target }} 
-
-    - name: Build Release
-      if: ${{ matrix.mode != 'debug' }}
-      run: zig build -D${{ matrix.mode }} -Dtarget=${{ matrix.target }} 
-
   test:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [
-          ubuntu-latest,
           windows-latest,
           macos-latest,
         ]
diff --git a/tools/regz/README.md b/tools/regz/README.md
index 83944e1..7be310c 100644
--- a/tools/regz/README.md
+++ b/tools/regz/README.md
@@ -1,5 +1,7 @@
 # regz
 
+[![Build status](https://badge.buildkite.com/58b618b0a1ce7917d66f28d48745cdb35b23ce522036495f40.svg)](https://buildkite.com/zig-embedded-group/regz)
+
 regz is a Zig code generator for microcontrollers. Vendors often publish files
 that have the details of special function registers, for ARM this is called a
 "System View Description" (SVD), for AVR the format is called ATDF. This tool
@@ -83,3 +85,4 @@ future. If you know of any others we should look into, please make an issue!
     - [ ] RISC-V interrupt table generation
 - [x] ATDF: AVR's register schema format
 - [ ] insert name of Texus Insturment's register schema format for MSP430
+