diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c5f7fd129..d30744899 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -628,13 +628,13 @@ jobs:
         #   arch_gnu: mips64el
         #   arch_gnu_abi: abi64
         #   distro: ubuntu-24.04-arm
-        - version: 21
+        - version: 23
           cross: armel
           arch_gnu_abi: eabi
           arch_deb: armel
           arch_gnu: arm
           distro: ubuntu-26.04-arm
-        - version: 21
+        - version: 23
           cross: riscv64
           arch_gnu: riscv64
           arch_deb: riscv64
@@ -644,23 +644,23 @@ jobs:
           arch_gnu: s390x
           arch_deb: s390x
           distro: ubuntu-24.04-arm
-        - version: 21
+        - version: 23
           cross: ppc64el
           arch_deb: ppc64el
           arch_gnu: powerpc64le
           distro: ubuntu-26.04-arm
-        - version: 21
+        - version: 23
           cross: loongarch64
           arch_deb: loong64
           arch_gnu: loongarch64
           distro: ubuntu-26.04-arm
-        - version: 21
+        - version: 23
           cross: loongarch64
           extra: -fastmath
           arch_deb: loong64
           arch_gnu: loongarch64
           distro: ubuntu-26.04-arm
-        - version: 22
+        - version: 23
           cross: loongarch64
           extra: -fastmath
           arch_deb: loong64
@@ -858,6 +858,28 @@ jobs:
         - version: "22"
           distro: ubuntu-26.04-arm
           arch_flags: -Wno-unsafe-buffer-usage -Wno-switch-default -Wno-c++-keyword -O2
+        - version: "23"
+          distro: ubuntu-26.04
+          arch_flags: -Wno-unsafe-buffer-usage -Wno-switch-default -Wno-c++-keyword
+        - version: "23"
+          distro: ubuntu-26.04
+          arch_flags: -ffast-math -Wno-unsafe-buffer-usage -Wno-switch-default -Wno-c++-keyword -Wno-nan-infinity-disabled
+        - version: "23"
+          distro: ubuntu-26.04
+          arch_flags: -Wno-unsafe-buffer-usage -Wno-switch-default -Wno-c++-keyword -O2
+        # - version: "23"
+        #   distro: ubuntu-26.04-arm
+        #   arch_flags: -Wno-unsafe-buffer-usage -Wno-switch-default -Wno-c++-keyword
+        - version: "23"
+          distro: ubuntu-26.04-arm
+          plain: true
+          arch_flags: -Wno-unsafe-buffer-usage -Wno-switch-default -Wno-c++-keyword
+        # - version: "23"
+        #   distro: ubuntu-26.04-arm
+        #   arch_flags: -ffast-math -Wno-unsafe-buffer-usage -Wno-switch-default -Wno-c++-keyword -Wno-nan-infinity-disabled
+        - version: "23"
+          distro: ubuntu-26.04-arm
+          arch_flags: -Wno-unsafe-buffer-usage -Wno-switch-default -Wno-c++-keyword -O2
     runs-on: ${{ matrix.distro }}
     env:
       CFLAGS: ${{ matrix.arch_flags }} ${{ case(
@@ -958,6 +980,14 @@ jobs:
             os: macos-26-intel
             arch_flags: -Wno-poison-system-directories -Wno-switch-default -Wno-c++-keyword
               # "-Wno-poison-system-directories": due to meson test
+          - xcode: "26.6"  # clang 21?
+            os: macos-26
+            arch_flags: -Wno-poison-system-directories -Wno-switch-default -Wno-c++-keyword
+              # "-Wno-poison-system-directories": due to meson test
+          - xcode: "27.0"  # clang 21?
+            os: xcode-27
+            arch_flags: -Wno-poison-system-directories -Wno-switch-default -Wno-c++-keyword
+              # "-Wno-poison-system-directories": due to meson test
     runs-on: ${{ matrix.os }}
     env:
       DEVELOPER_DIR:  /Applications/Xcode_${{ matrix.xcode }}.app