diff --git a/.github/workflows/mosquitto-cmake-asan.yml b/.github/workflows/linux-asan.yml
similarity index 99%
rename from .github/workflows/mosquitto-cmake-asan.yml
rename to .github/workflows/linux-asan.yml
index b0a2b6cbf..95bdd09e2 100644
--- a/.github/workflows/mosquitto-cmake-asan.yml
+++ b/.github/workflows/linux-asan.yml
@@ -1,4 +1,4 @@
-name: ASAN
+name: Linux - ASAN
 
 on:
   workflow_dispatch:
diff --git a/.github/workflows/build-variants.yml b/.github/workflows/linux-build-variants.yml
similarity index 97%
rename from .github/workflows/build-variants.yml
rename to .github/workflows/linux-build-variants.yml
index 7eee9800d..e8ee330f9 100644
--- a/.github/workflows/build-variants.yml
+++ b/.github/workflows/linux-build-variants.yml
@@ -1,4 +1,4 @@
-name: Mosquitto - Build variants
+name: Linux - Build variants
 
 on:
   push:
diff --git a/.github/workflows/mosquitto-cmake.yml b/.github/workflows/linux.yml
similarity index 98%
rename from .github/workflows/mosquitto-cmake.yml
rename to .github/workflows/linux.yml
index ef2670202..a9681e0e1 100644
--- a/.github/workflows/mosquitto-cmake.yml
+++ b/.github/workflows/linux.yml
@@ -1,4 +1,4 @@
-name: Mosquitto - CMake
+name: Linux
 
 on:
   workflow_dispatch:
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 0841d2b0e..ec4824fbe 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -1,4 +1,4 @@
-name: Mac OS build
+name: Mac OS
 
 on:
   workflow_dispatch:
@@ -22,7 +22,7 @@ env:
   BUILD_TYPE: Release
 
 jobs:
-  mosquitto:
+  build:
     runs-on: macos-latest
 
     steps:
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 969f71e32..ce6e05e5b 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -1,4 +1,4 @@
-name: Windows build
+name: Windows
 
 on:
   workflow_dispatch:
@@ -23,7 +23,7 @@ env:
 
 
 jobs:
-  mosquitto:
+  build:
     runs-on: windows-2022
 
     strategy: