diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 97495eb28..9ccb51e39 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -8,16 +8,28 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+
       - name: Set Git http.postBuffer to something high
         run: git config --global http.postBuffer 524288000
+
       - 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
-        run: make clean && make V=1
+        env:
+          V: 1
+        run: make
+
       - name: Test
         run: make check
 
@@ -28,16 +40,29 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+
       - name: Set Git http.postBuffer to something high
         run: git config --global http.postBuffer 524288000
+
       - 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
-        run: make clean && make V=1 PLATFORM_EXTRAS=BTADDON
+        env:
+          V: 1
+          PLATFORM_EXTRAS: BTADDON
+        run: make
+
       - name: Test
         run: make check
 
@@ -48,15 +73,32 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+
       - name: Set Git http.postBuffer to something high
         run: git config --global http.postBuffer 524288000
+
       - 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
-        run: mkdir -p client/build && ( cd client/build && cmake .. && make VERBOSE=1 )
+        env:
+          VERBOSE: 1
+        run: make
+        working-directory: client/build/
+
       - name: Test
         run: make client/check CHECKARGS="--clientbin ./client/build/proxmark3"