diff --git a/.github/workflows/macos.yaml b/.github/workflows/macos.yaml
new file mode 100644
index 000000000..e17a02983
--- /dev/null
+++ b/.github/workflows/macos.yaml
@@ -0,0 +1,38 @@
+name: macos
+
+on: [push, pull_request]
+
+jobs:
+
+  macos-build:
+    runs-on: ${{ matrix.macos-version }}
+    strategy:
+      fail-fast: false
+      matrix:
+        macos-version:
+          - 'macos-latest'
+
+    steps:
+      - name: Sync repository
+        uses: actions/checkout@v2
+        
+      - name: Cache Qt
+        id: cache-qt
+        uses: actions/cache@v1  # not v2!
+        with:
+          path: '${{ github.workspace }}/qt_installation/'
+          key: ${{ runner.os }}-QtCache
+
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v2.13.0
+        with:
+          version: '5.15.2'
+          host: 'mac'
+          dir: '${{ github.workspace }}/qt_installation/'
+          cached: ${{ steps.cache-qt.outputs.cache-hit }}
+
+      - name: Build Plotjuggler
+        shell: pwsh
+        run: >
+          cmake -B build -DCMAKE_INSTALL_PREFIX=install PlotJuggler;
+          cmake --build build --target install
diff --git a/.github/workflows/cmake.yaml b/.github/workflows/ubuntu.yaml
similarity index 54%
rename from .github/workflows/cmake.yaml
rename to .github/workflows/ubuntu.yaml
index ce238f7fd..cfe1789aa 100644
--- a/.github/workflows/cmake.yaml
+++ b/.github/workflows/ubuntu.yaml
@@ -1,4 +1,4 @@
-name: cmake
+name: ubuntu
 
 on: [push, pull_request]
 
@@ -33,31 +33,3 @@ jobs:
         run: |
             cmake -B build -DCMAKE_INSTALL_PREFIX=install PlotJuggler;
             cmake --build build --target install
-
-  windows-build:
-    runs-on: ${{ matrix.windows-version }}
-    strategy:
-      fail-fast: false
-      matrix:
-        windows-version:
-          - 'windows-2019'
-          - 'windows-latest'
-    env:
-      CXXFLAGS: /MP
-
-    steps:
-      - name: Sync repository
-        uses: actions/checkout@v2
-
-      - name: Install Qt
-        uses: jurplel/install-qt-action@v2.13.0
-        with:
-          version: '5.15.2'
-          arch: 'win64_msvc2019_64'
-          dir: '${{ github.workspace }}/qt_installation/'
-
-      - name: Build Plotjuggler
-        shell: pwsh
-        run: >
-          cmake -Ax64 -T host=x64 -B build -DCMAKE_INSTALL_PREFIX=install PlotJuggler;
-          cmake --build build --target install
diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml
new file mode 100644
index 000000000..aa42395ed
--- /dev/null
+++ b/.github/workflows/windows.yaml
@@ -0,0 +1,42 @@
+name: windows
+
+on: [push, pull_request]
+
+jobs:
+
+  windows-build:
+    runs-on: ${{ matrix.windows-version }}
+    strategy:
+      fail-fast: false
+      matrix:
+        windows-version:
+          - 'windows-2019'
+          - 'windows-latest'
+    env:
+      CXXFLAGS: /MP
+
+    steps:
+      - name: Sync repository
+        uses: actions/checkout@v2
+        
+      - name: Cache Qt
+        id: cache-qt
+        uses: actions/cache@v1  # not v2!
+        with:
+          path: '${{ github.workspace }}/qt_installation/'
+          key: ${{ runner.os }}-QtCache
+          
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v2.13.0
+        with:
+          version: '5.15.2'
+          arch: 'win64_msvc2019_64'
+          dir: '${{ github.workspace }}/qt_installation/'
+          cached: ${{ steps.cache-qt.outputs.cache-hit }}
+
+      - name: Build Plotjuggler
+        shell: pwsh
+        run: >
+          cmake -Ax64 -T host=x64 -B build -DCMAKE_INSTALL_PREFIX=install PlotJuggler;
+          cmake --build build --target install
+ 
diff --git a/README.md b/README.md
index d7f51888a..bcf6a27c7 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,10 @@
 ![PlotJuggler](docs/plotjuggler3_banner.svg)
 
-[![cmake](https://github.com/facontidavide/PlotJuggler/actions/workflows/cmake.yaml/badge.svg)](https://github.com/facontidavide/PlotJuggler/actions/workflows/cmake.yaml)
-[![CI](https://github.com/facontidavide/PlotJuggler/workflows/ros1/badge.svg)](https://github.com/facontidavide/PlotJuggler/actions?query=workflow%3Aros1)
-[![CI](https://github.com/facontidavide/PlotJuggler/workflows/ros2/badge.svg)](https://github.com/facontidavide/PlotJuggler/actions?query=workflow%3Aros2)
+[![windows](https://github.com/facontidavide/PlotJuggler/actions/workflows/windows.yaml/badge.svg)](https://github.com/facontidavide/PlotJuggler/actions/workflows/windows.yaml)
+[![ubuntu](https://github.com/facontidavide/PlotJuggler/actions/workflows/ubuntu.yaml/badge.svg)](https://github.com/facontidavide/PlotJuggler/actions/workflows/ubuntu.yaml)
+[![macos](https://github.com/facontidavide/PlotJuggler/actions/workflows/macos.yaml/badge.svg)](https://github.com/facontidavide/PlotJuggler/actions/workflows/macos.yaml)
+[![ROS1](https://github.com/facontidavide/PlotJuggler/workflows/ros1/badge.svg)](https://github.com/facontidavide/PlotJuggler/actions?query=workflow%3Aros1)
+[![ROS2](https://github.com/facontidavide/PlotJuggler/workflows/ros2/badge.svg)](https://github.com/facontidavide/PlotJuggler/actions?query=workflow%3Aros2)
 [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social)](https://twitter.com/intent/tweet?text=I%20use%20PlotJuggler%20and%20it%20is%20amazing%0D%0A&url=https://github.com/facontidavide/PlotJuggler&via=facontidavide&hashtags=dataviz,plotjuggler,GoROS,PX4)
 
 **Gold Sponsor**: [Greenzie](https://www.greenzie.com/)