diff --git a/.github/workflows/test_chibios.yml b/.github/workflows/test_chibios.yml
index cc7bb1c607..1091960ff6 100644
--- a/.github/workflows/test_chibios.yml
+++ b/.github/workflows/test_chibios.yml
@@ -71,8 +71,8 @@ jobs:
         shell: bash
         run: |
           if [[ ${{ matrix.toolchain }} == "chibios-clang" ]]; then
-            export CC=clang-7
-            export CXX=clang++-7
+            export CC=clang
+            export CXX=clang++
           fi
           PATH="/usr/lib/ccache:/opt/gcc-arm-none-eabi-${{matrix.gcc}}/bin:$PATH"
           PATH="/github/home/.local/bin:$PATH"
diff --git a/.github/workflows/test_linux_sbc.yml b/.github/workflows/test_linux_sbc.yml
index 53d0100f83..7c1ef11688 100644
--- a/.github/workflows/test_linux_sbc.yml
+++ b/.github/workflows/test_linux_sbc.yml
@@ -73,8 +73,8 @@ jobs:
         shell: bash
         run: |
           if [[ ${{ matrix.toolchain }} == "clang" ]]; then
-            export CC=clang-7
-            export CXX=clang++-7
+            export CC=clang
+            export CXX=clang++
           fi
           PATH="/github/home/.local/bin:$PATH"
           Tools/scripts/build_ci.sh
diff --git a/.github/workflows/test_replay.yml b/.github/workflows/test_replay.yml
index 2eb4f6e721..69ca68c587 100644
--- a/.github/workflows/test_replay.yml
+++ b/.github/workflows/test_replay.yml
@@ -54,8 +54,8 @@ jobs:
         shell: bash
         run: |
           if [[ ${{ matrix.toolchain }} == "clang" ]]; then
-            export CC=clang-7
-            export CXX=clang++-7
+            export CC=clang
+            export CXX=clang++
           fi
           PATH="/github/home/.local/bin:$PATH"
           Tools/scripts/build_ci.sh
diff --git a/.github/workflows/test_sitl_copter.yml b/.github/workflows/test_sitl_copter.yml
index 25af9eb4eb..bb99604bba 100644
--- a/.github/workflows/test_sitl_copter.yml
+++ b/.github/workflows/test_sitl_copter.yml
@@ -49,8 +49,8 @@ jobs:
         shell: bash
         run: |
           if [[ ${{ matrix.toolchain }} == "clang" ]]; then
-            export CC=clang-7
-            export CXX=clang++-7
+            export CC=clang
+            export CXX=clang++
           fi
           PATH="/github/home/.local/bin:$PATH"
           ./waf configure --board sitl
diff --git a/.github/workflows/test_sitl_plane.yml b/.github/workflows/test_sitl_plane.yml
index 74b3af3aaf..9d4f7df05f 100644
--- a/.github/workflows/test_sitl_plane.yml
+++ b/.github/workflows/test_sitl_plane.yml
@@ -49,8 +49,8 @@ jobs:
         shell: bash
         run: |
           if [[ ${{ matrix.toolchain }} == "clang" ]]; then
-            export CC=clang-7
-            export CXX=clang++-7
+            export CC=clang
+            export CXX=clang++
           fi
           PATH="/github/home/.local/bin:$PATH"
           ./waf configure --board sitl
diff --git a/.github/workflows/test_sitl_rover.yml b/.github/workflows/test_sitl_rover.yml
index 6aa1d5a0c6..1b0ee63153 100644
--- a/.github/workflows/test_sitl_rover.yml
+++ b/.github/workflows/test_sitl_rover.yml
@@ -49,8 +49,8 @@ jobs:
         shell: bash
         run: |
           if [[ ${{ matrix.toolchain }} == "clang" ]]; then
-            export CC=clang-7
-            export CXX=clang++-7
+            export CC=clang
+            export CXX=clang++
           fi
           PATH="/github/home/.local/bin:$PATH"
           ./waf configure --board sitl
diff --git a/.github/workflows/test_sitl_sub.yml b/.github/workflows/test_sitl_sub.yml
index dee9f5b756..8d43b72d18 100644
--- a/.github/workflows/test_sitl_sub.yml
+++ b/.github/workflows/test_sitl_sub.yml
@@ -49,8 +49,8 @@ jobs:
         shell: bash
         run: |
           if [[ ${{ matrix.toolchain }} == "clang" ]]; then
-            export CC=clang-7
-            export CXX=clang++-7
+            export CC=clang
+            export CXX=clang++
           fi
           PATH="/github/home/.local/bin:$PATH"
           ./waf configure --board sitl
diff --git a/.github/workflows/test_sitl_tracker.yml b/.github/workflows/test_sitl_tracker.yml
index 1cb3cfeef1..db9fc0586a 100644
--- a/.github/workflows/test_sitl_tracker.yml
+++ b/.github/workflows/test_sitl_tracker.yml
@@ -49,8 +49,8 @@ jobs:
         shell: bash
         run: |
           if [[ ${{ matrix.toolchain }} == "clang" ]]; then
-            export CC=clang-7
-            export CXX=clang++-7
+            export CC=clang
+            export CXX=clang++
           fi
           PATH="/github/home/.local/bin:$PATH"
           ./waf configure --board sitl
diff --git a/.github/workflows/test_unit_tests.yml b/.github/workflows/test_unit_tests.yml
index 2f4bcc5cb0..db361317e6 100644
--- a/.github/workflows/test_unit_tests.yml
+++ b/.github/workflows/test_unit_tests.yml
@@ -59,8 +59,8 @@ jobs:
         shell: 'script -q -e -c "bash {0}"'
         run: |
           if [[ ${{ matrix.toolchain }} == "clang" ]]; then
-            export CC=clang-7
-            export CXX=clang++-7
+            export CC=clang
+            export CXX=clang++
           fi
           PATH="/github/home/.local/bin:$PATH"
           Tools/scripts/build_ci.sh