diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 92b68b2..70bf264 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -43,13 +43,15 @@ jobs:
         include:
           # Linux, gcc
           - { compiler: gcc-12, cxxstd: '14,17,20', boostBranch: boost-1.86.0, os: ubuntu-22.04 }
-          - { compiler: gcc-12, cxxstd: '14,17,20', boostBranch: master, os: ubuntu-22.04 }
+          - { compiler: gcc-14, cxxstd: '14,17,20', boostBranch: boost-1.86.0, os: ubuntu-22.04 }
+          - { compiler: gcc-14, cxxstd: '14,17,20', boostBranch: master, os: ubuntu-22.04 }
 
           # Linux, clang
           - { compiler: clang-14,  cxxstd: '14,17,20', boostBranch: boost-1.86.0, os: ubuntu-22.04 }
-          - { compiler: clang-14,  cxxstd: '14,17,20', boostBranch: master, os: ubuntu-22.04 }
+          - { compiler: clang-19,  cxxstd: '14,17,20', boostBranch: boost-1.86.0, os: ubuntu-22.04 }
+          - { compiler: clang-19,  cxxstd: '14,17,20', boostBranch: master, os: ubuntu-22.04 }
 
-          - { name: Collect coverage, coverage: yes, compiler: gcc-8, cxxstd: '14', boostBranch: boost-1.86.0, os: ubuntu-20.04 }
+          - { name: Collect coverage, coverage: yes, compiler: gcc-14, cxxstd: '14', boostBranch: boost-1.86.0, os: ubuntu-22.04 }
 
     timeout-minutes: 120
     runs-on: ${{matrix.os}}
@@ -124,11 +126,7 @@ jobs:
 
       - name: Boost build
         run: |
-          if [[ "${{matrix.boostBranch}}" == "master" ]]; then
-            B2_FLAGS="cxxstd=${{matrix.cxxstd}}"
-          else
-            B2_FLAGS="cxxflags=-std=c++${{matrix.cxxstd}}"
-          fi
+          B2_FLAGS="cxxstd=${{matrix.cxxstd}}"
           if [[ "${{matrix.coverage}}" == "yes" ]]; then
             B2_FLAGS="$B2_FLAGS cxxflags=--coverage linkflags=--coverage"
           fi