diff --git a/.github/workflows/main-auto.yml b/.github/workflows/main-auto.yml
index 533d73a35dc..0458c6e12f9 100644
--- a/.github/workflows/main-auto.yml
+++ b/.github/workflows/main-auto.yml
@@ -90,7 +90,7 @@ jobs:
     if: "!contains(github.event.head_commit.message, 'skip-ci')"
 
     # The type of runner that the job will run on
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b6f16f4b951..8a38137dbcb 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -27,67 +27,70 @@ permissions:
 # in parallel. We just have one job, but the matrix items defined below will
 # run in parallel.
 jobs:
-
-  call-workflow-special-autotools:
-    uses: ./.github/workflows/main-auto-spc.yml
-
-  call-parallel-special-autotools:
-    uses: ./.github/workflows/main-auto-par.yml
-
-  call--debug-thread-autotools:
-    uses: ./.github/workflows/main-auto.yml
-    with:
-        thread_safety: true
-        build_mode: "debug"
-
-  call-release-thread-autotools:
-    uses: ./.github/workflows/main-auto.yml
-    with:
-        thread_safety: true
-        build_mode: "production"
-
-  call-debug-autotools:
-    uses: ./.github/workflows/main-auto.yml
-    with:
-        thread_safety: false
-        build_mode: "debug"
-
-  call-release-autotools:
-    uses: ./.github/workflows/main-auto.yml
-    with:
-        thread_safety: false
-        build_mode: "production"
-
-  call-release-auto-intel:
-    uses: ./.github/workflows/intel-auto.yml
-    with:
-        build_mode: "production"
-
-  call-debug-thread-cmake:
-    uses: ./.github/workflows/main-cmake.yml
-    with:
-        thread_safety: true
-        build_mode: "Debug"
-
-  call-release-thread-cmake:
-    uses: ./.github/workflows/main-cmake.yml
-    with:
-        thread_safety: true
-        build_mode: "Release"
-
-  call-debug-cmake:
-    uses: ./.github/workflows/main-cmake.yml
-    with:
-        thread_safety: false
-        build_mode: "Debug"
-
-  call-release-cmake:
-    uses: ./.github/workflows/main-cmake.yml
-    with:
-        thread_safety: false
-        build_mode: "Release"
-
-  call-release-cmake-intel:
-    uses: ./.github/workflows/intel-cmake.yml
-    with:
-        build_mode: "Release"
+  call-workflow-autotools:
+    steps:
+      - name: call-workflow-special-autotools:
+        uses: ./.github/workflows/main-auto-spc.yml
+
+      - name: call-parallel-special-autotools:
+        uses: ./.github/workflows/main-auto-par.yml
+
+      - name: call-debug-thread-autotools:
+        uses: ./.github/workflows/main-auto.yml
+        with:
+            thread_safety: true
+            build_mode: "debug"
+
+      - name: call-release-thread-autotools:
+        uses: ./.github/workflows/main-auto.yml
+        with:
+            thread_safety: true
+            build_mode: "production"
+
+      - name: call-debug-autotools:
+        uses: ./.github/workflows/main-auto.yml
+        with:
+            thread_safety: false
+            build_mode: "debug"
+
+      - name: call-release-autotools:
+        uses: ./.github/workflows/main-auto.yml
+        with:
+            thread_safety: false
+            build_mode: "production"
+
+      - name: call-release-auto-intel:
+        uses: ./.github/workflows/intel-auto.yml
+        with:
+            build_mode: "production"
+
+  call-workflow-cmake:
+    steps:
+      - name: call-debug-thread-cmake:
+        uses: ./.github/workflows/main-cmake.yml
+        with:
+            thread_safety: true
+            build_mode: "Debug"
+
+      - name: call-release-thread-cmake:
+        uses: ./.github/workflows/main-cmake.yml
+        with:
+            thread_safety: true
+            build_mode: "Release"
+
+      - name: call-debug-cmake:
+        uses: ./.github/workflows/main-cmake.yml
+        with:
+            thread_safety: false
+            build_mode: "Debug"
+
+      - name: call-release-cmake:
+        uses: ./.github/workflows/main-cmake.yml
+        with:
+            thread_safety: false
+            build_mode: "Release"
+
+      - name: call-release-cmake-intel:
+        uses: ./.github/workflows/intel-cmake.yml
+        with:
+            build_mode: "Release"