diff --git a/.github/workflows/compilers.yml b/.github/workflows/compilers.yml
index a76280aff..38eecbc83 100644
--- a/.github/workflows/compilers.yml
+++ b/.github/workflows/compilers.yml
@@ -235,8 +235,8 @@ jobs:
         sudo apt-get update
         sudo apt-get install -y flang-21 clang-21
         sudo update-alternatives \
-          --install /usr/bin/flang flang /usr/bin/flang-21 100 \
-          --slave   /usr/bin/clang clang /usr/bin/clang-21 \
+          --install /usr/bin/clang clang /usr/bin/clang-21 100 \
+          --slave   /usr/bin/flang flang /usr/bin/flang-21 \
           --slave   /usr/bin/clang++ clang++ /usr/bin/clang++-21
         flang --version
         clang --version
diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml
index 9aa39a290..a2971e096 100644
--- a/.github/workflows/makefile.yml
+++ b/.github/workflows/makefile.yml
@@ -60,7 +60,13 @@ jobs:
         toolchain:
         - FC: gfortran
           CC: gcc
-          os: [ ubuntu-24.04, ubuntu-24.04-arm, windows-2025 ]
+          os: ubuntu-26.04
+        - FC: gfortran
+          CC: gcc
+          os: ubuntu-26.04-arm
+        - FC: gfortran
+          CC: gcc
+          os: windows-2025
         - FC: gfortran-14
           CC: gcc-14
           os: macos-26