diff --git a/.github/actions/run-linter/action.yml b/.github/actions/run-linter/action.yml
index 85edb333e..6e58fb066 100644
--- a/.github/actions/run-linter/action.yml
+++ b/.github/actions/run-linter/action.yml
@@ -23,7 +23,7 @@ runs:
     - uses: mjp41/workaround8649@c8550b715ccdc17f89c8d5c28d7a48eeff9c94a8
       if: runner.os == 'Linux'
       with:
-        os: ubuntu-latest
+        os: ubuntu-24.04
 
     - name: Install ctcache
       uses: syyyr/clang-tidy-cache-action@v1.1.0
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index afdedbce4..45cbeb44c 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -13,11 +13,11 @@ on:
 
 jobs:
   clang-tidy:
-    name: clang-tidy / Ubuntu 22.04
-    runs-on: ubuntu-22.04
+    name: clang-tidy / Ubuntu 24.04
+    runs-on: ubuntu-24.04
     env:
-      CC: clang-15
-      CXX: clang++-15
+      CC: clang-18
+      CXX: clang++-18
     steps:
       - uses: actions/checkout@v4
         with:
@@ -26,14 +26,14 @@ jobs:
       - name: Run clang-tidy
         uses: ./.github/actions/run-linter
         with:
-          lint_program_with_args: clang-tidy-cache clang-tidy-15 -p build --header-filter=.* --quiet --warnings-as-errors=*
+          lint_program_with_args: clang-tidy-cache clang-tidy-18 -p build --header-filter=.* --quiet --warnings-as-errors=*
 
   clazy:
-    name: clazy / Ubuntu 22.04
-    runs-on: ubuntu-22.04
+    name: clazy / Ubuntu 24.04
+    runs-on: ubuntu-24.04
     env:
-      CC: clang-15
-      CXX: clang++-15
+      CC: clang-18
+      CXX: clang++-18
     steps:
       - uses: actions/checkout@v4
         with: