diff --git a/.github/workflows/linux-full-tests.yml b/.github/workflows/linux-full-tests.yml
index 527dc395e37..7561d4a451b 100644
--- a/.github/workflows/linux-full-tests.yml
+++ b/.github/workflows/linux-full-tests.yml
@@ -110,11 +110,17 @@ jobs:
             tag: mantic
             cc: clang
             cxx: clang++
-          - name: "Clang 17"
+          - name: "Clang 17 (Boost 1.84)"
             shortname: clang17
+            tag: clang-17
+            cc: clang
+            cxx: clang++
+          - name: "Clang 18"
+            shortname: clang18
             tag: noble
             cc: clang
             cxx: clang++
+            cxxflags: -Wno-deprecated-declarations
           - name: "C++14 mode"
             shortname: c++14
             tag: rolling
diff --git a/.github/workflows/linux-nondefault.yml b/.github/workflows/linux-nondefault.yml
index ce05c918d30..f55c60aabd6 100644
--- a/.github/workflows/linux-nondefault.yml
+++ b/.github/workflows/linux-nondefault.yml
@@ -110,11 +110,12 @@ jobs:
             tag: mantic
             cc: clang
             cxx: clang++
-          - name: "Clang 17"
-            shortname: clang17
+          - name: "Clang 18"
+            shortname: clang18
             tag: noble
             cc: clang
             cxx: clang++
+            cxxflags: -Wno-deprecated-declarations
           - name: "C++14 mode"
             shortname: c++14
             tag: rolling
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index d26aeacda07..1dd8d41ba34 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -39,11 +39,12 @@ jobs:
             cc: clang
             cxx: clang++
             tests: true
-          - name: "Clang 17"
-            shortname: clang17
+          - name: "Clang 18"
+            shortname: clang18
             tag: noble
             cc: clang
             cxx: clang++
+            cxxflags: -Wno-deprecated-declarations
             tests: true
           - name: "C++14 mode"
             shortname: c++14