diff --git a/.github/workflows/macos-cmake.yaml b/.github/workflows/macos-cmake.yaml
deleted file mode 100644
index 8c6a41f37..000000000
--- a/.github/workflows/macos-cmake.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: MacOS (cmake) Build and Test
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    runs-on: macos-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Update brew repos
-      run: brew update
-    - name: Tap RfidResearchGroup/proxmark3
-      run: brew tap RfidResearchGroup/proxmark3
-    - name: Install dependencies
-      run: brew install readline qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc
-    - name: Build
-      run: mkdir -p client/build && ( cd client/build && cmake .. && make VERBOSE=1 )
-    - name: Test
-      run: make client/check CHECKARGS="--clientbin ./client/build/proxmark3"
diff --git a/.github/workflows/macos-make-btaddon.yml b/.github/workflows/macos-make-btaddon.yml
deleted file mode 100644
index 9d5b75ff7..000000000
--- a/.github/workflows/macos-make-btaddon.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: MacOS (make with BTADDON) Build and Test
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    runs-on: macos-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Update brew repos
-      run: brew update
-    - name: Tap RfidResearchGroup/proxmark3
-      run: brew tap RfidResearchGroup/proxmark3
-    - name: Install dependencies
-      run: brew install readline qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc
-    - name: Build
-      run: make clean && make V=1 PLATFORM_EXTRAS=BTADDON
-    - name: Test
-      run: make check
diff --git a/.github/workflows/macos-make.yml b/.github/workflows/macos-make.yml
deleted file mode 100644
index a612bcda2..000000000
--- a/.github/workflows/macos-make.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: MacOS (make) Build and Test
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    runs-on: macos-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Update brew repos
-      run: brew update
-    - name: Tap RfidResearchGroup/proxmark3
-      run: brew tap RfidResearchGroup/proxmark3
-    - name: Install dependencies
-      run: brew install readline qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc
-    - name: Build
-      run: make clean && make V=1
-    - name: Test
-      run: make check
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
new file mode 100644
index 000000000..cef27e89e
--- /dev/null
+++ b/.github/workflows/macos.yml
@@ -0,0 +1,115 @@
+name: MacOS Build and Test
+
+on: [push, pull_request]
+
+jobs:
+  build-make:
+    runs-on: macos-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set Git http.postBuffer to something high
+        run: git config --global http.postBuffer 524288000
+
+      - name: Handle homebrew quirks
+        run: rm -rf /usr/local/bin/2to3
+
+      - name: Update brew repos
+        run: brew update
+        continue-on-error: true
+
+      - name: Tap RfidResearchGroup/proxmark3
+        run: brew tap RfidResearchGroup/proxmark3
+
+      - name: Install dependencies
+        run: brew install readline qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc
+
+      - name: make clean
+        run: make clean
+
+      - name: Build
+        env:
+          V: 1
+        run: make
+
+      - name: Test
+        run: make check
+
+  build-make-btaddon:
+    if: always()
+    needs: [build-make]
+    runs-on: macos-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set Git http.postBuffer to something high
+        run: git config --global http.postBuffer 524288000
+
+      - name: Handle homebrew quirks
+        run: rm -rf /usr/local/bin/2to3
+
+      - name: Update brew repos
+        run: brew update
+        continue-on-error: true
+
+      - name: Tap RfidResearchGroup/proxmark3
+        run: brew tap RfidResearchGroup/proxmark3
+
+      - name: Install dependencies
+        run: brew install readline qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc
+
+      - name: make clean
+        run: make clean
+
+      - name: Build
+        env:
+          V: 1
+          PLATFORM_EXTRAS: BTADDON
+        run: make
+
+      - name: Test
+        run: make check
+
+  build-cmake:
+    if: always()
+    needs: [build-make, build-make-btaddon]
+    runs-on: macos-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set Git http.postBuffer to something high
+        run: git config --global http.postBuffer 524288000
+
+      - name: Handle homebrew quirks
+        run: rm -rf /usr/local/bin/2to3
+
+      - name: Update brew repos
+        run: brew update
+        continue-on-error: true
+
+      - name: Tap RfidResearchGroup/proxmark3
+        run: brew tap RfidResearchGroup/proxmark3
+
+      - name: Install dependencies
+        run: brew install readline qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc
+
+      - name: Prepare Build Folders
+        run: mkdir -p client/build
+
+      - name: Initiate cmake environment
+        run: cmake ..
+        working-directory: client/build/
+
+      - name: Build
+        env:
+          VERBOSE: 1
+        run: make
+        working-directory: client/build/
+
+      - name: Test
+        env:
+          CHECKARGS: "--clientbin ./client/build/proxmark3"
+        run: make client/check
diff --git a/.github/workflows/ubuntu-cmake.yml b/.github/workflows/ubuntu-cmake.yml
deleted file mode 100644
index dd99487f1..000000000
--- a/.github/workflows/ubuntu-cmake.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-name: Ubuntu (cmake) Build and Test
-
-on: [push, pull_request]
-
-jobs:
-  build-and-test:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Update apt repos
-      run: sudo apt-get update
-    - name: Install dependencies
-      run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0-dbg liblua5.2-0 lua5.2 sed
-    - name: Build
-      run: mkdir -p client/build && ( cd client/build && cmake .. && make VERBOSE=1 )
-    - name: Test
-      run: make client/check CHECKARGS="--clientbin ./client/build/proxmark3"
diff --git a/.github/workflows/ubuntu-make-btaddon.yml b/.github/workflows/ubuntu-make-btaddon.yml
deleted file mode 100644
index 0e11f01c3..000000000
--- a/.github/workflows/ubuntu-make-btaddon.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-name: Ubuntu (make with BTADDON) Build and Test
-
-on: [push, pull_request]
-
-jobs:
-  build-and-test:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Update apt repos
-      run: sudo apt-get update
-    - name: Install dependencies
-      run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0-dbg liblua5.2-0 lua5.2 sed
-    - name: Build
-      run: make clean && make V=1 PLATFORM_EXTRAS=BTADDON
-    - name: Test
-      run: make check
diff --git a/.github/workflows/ubuntu-make.yml b/.github/workflows/ubuntu-make.yml
deleted file mode 100644
index f4f7d0113..000000000
--- a/.github/workflows/ubuntu-make.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-name: Ubuntu (make) Build and Test
-
-on: [push, pull_request]
-
-jobs:
-  build-and-test:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Update apt repos
-      run: sudo apt-get update
-    - name: Install dependencies
-      run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0-dbg liblua5.2-0 lua5.2 sed
-    - name: Build
-      run: make clean && make V=1
-    - name: Test
-      run: make check
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
new file mode 100644
index 000000000..394088e87
--- /dev/null
+++ b/.github/workflows/ubuntu.yml
@@ -0,0 +1,85 @@
+name: Ubuntu Build and Test
+
+on: [push, pull_request]
+
+jobs:
+  build-make:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Update apt repos
+        run: sudo apt-get update
+
+      - name: Install dependencies
+        run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0-dbg liblua5.2-0 lua5.2 sed
+
+      - name: make clean
+        run: make clean
+
+      - name: Build
+        env:
+          V: 1
+        run: make
+
+      - name: Test
+        run: make check
+
+  build-make-btaddon:
+    if: always()
+    needs: [build-make]
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Update apt repos
+        run: sudo apt-get update
+
+      - name: Install dependencies
+        run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0-dbg liblua5.2-0 lua5.2 sed
+
+      - name: make clean
+        run: make clean
+
+      - name: Build
+        env:
+          V: 1
+          PLATFORM_EXTRAS: BTADDON
+        run: make
+
+      - name: Test
+        run: make check
+
+  build-cmake:
+    if: always()
+    needs: [build-make, build-make-btaddon]
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Update apt repos
+        run: sudo apt-get update
+
+      - name: Install dependencies
+        run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0-dbg liblua5.2-0 lua5.2 sed
+
+      - name: Prepare Build Folders
+        run: mkdir -p client/build
+
+      - name: Initiate cmake environment
+        run: cmake ..
+        working-directory: client/build/
+
+      - name: Build
+        env:
+          VERBOSE: 1
+        run: make
+        working-directory: client/build/
+
+      - name: Test
+        env:
+          CHECKARGS: "--clientbin ./client/build/proxmark3"
+        run: make client/check