diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3b753a37..ac0611cb 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -113,7 +113,7 @@ jobs:
         run:  |
           mkdir -p build
           cd build
-          cmake -DARM_NONE_EABI_TOOLCHAIN_PATH=${{ runner.temp }}/arm-none-eabi -DNRF5_SDK_PATH=${{ runner.temp }}/nrf5_sdk -DUSE_OPENOCD=1 -DBUILD_DFU=1 ../
+          cmake -G Ninja -DARM_NONE_EABI_TOOLCHAIN_PATH=${{ runner.temp }}/arm-none-eabi -DNRF5_SDK_PATH=${{ runner.temp }}/nrf5_sdk -DUSE_OPENOCD=1 -DBUILD_DFU=1 ../
 
         #########################################################################################
         # Make and Upload DFU Package
@@ -126,7 +126,7 @@ jobs:
       - name: Make pinetime-mcuboot-app
         run:  |
           cd build
-          make pinetime-mcuboot-app
+          ninja pinetime-mcuboot-app
 
       - name: Unzip DFU package
         run:  |
@@ -145,7 +145,7 @@ jobs:
       - name: Make pinetime-app
         run:  |
           cd build
-          make pinetime-app
+          ninja pinetime-app
 
       - name: Upload standalone firmware
         uses: actions/upload-artifact@v2
@@ -159,7 +159,7 @@ jobs:
       - name: Make pinetime-recovery
         run:  |
           cd build
-          make pinetime-recovery
+          ninja pinetime-recovery
 
       #########################################################################################
       # Finish