diff --git a/.github/workflows/clang-tidy-review.yml b/.github/workflows/clang-tidy-review.yml
index c7297103..bd88980d 100644
--- a/.github/workflows/clang-tidy-review.yml
+++ b/.github/workflows/clang-tidy-review.yml
@@ -18,15 +18,16 @@ jobs:
           - name: linux_clang-tidy_x64
             os: ubuntu-24.04
             build_type: Release
-            env_cc: clang-17
-            env_cxx: clang++-17
+            env_cc: clang-18
+            env_cxx: clang++-18
             qt_version: 6.8.1
             qt_arch_aqt: linux_gcc_64
             qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport
             qt_tools: ''
             conan_package_manager: --conf tools.system.package_manager:mode=install --conf tools.system.package_manager:sudo=True
-            conan_profile: scwx-linux_clang-17
-            compiler_packages: clang-17 clang-tidy-17
+            conan_profile: scwx-linux_clang-18
+            compiler_packages: clang-18 clang-tidy-18
+            clang_tidy_binary: clang-tidy-18
     name: ${{ matrix.name }}
     runs-on: ${{ matrix.os }}
     env:
@@ -118,7 +119,7 @@ jobs:
       shell: bash
       run: |
         cd source
-        review --clang_tidy_binary=clang-tidy-17 \
+        review --clang_tidy_binary=${{ matrix.clang_tidy_binary }} \
                --token=${{ github.token }} \
                --repo='${{ github.repository }}' \
                --pr='${{ github.event.pull_request.number }}' \
@@ -126,7 +127,7 @@ jobs:
                --base_dir='${{ github.workspace }}/source' \
                --clang_tidy_checks='' \
                --config_file='.clang-tidy' \
-               --include='*.[ch],*.[ch]xx,*.[ch]pp,*.[ch]++,*.cc,*.hh' \
+               --include='*.[ch],*.[ch]xx,*.[chi]pp,*.[ch]++,*.cc,*.hh' \
                --exclude='' \
                --apt-packages='' \
                --cmake-command='' \
diff --git a/tools/conan/profiles/scwx-linux_clang-18 b/tools/conan/profiles/scwx-linux_clang-18
new file mode 100644
index 00000000..ea19016b
--- /dev/null
+++ b/tools/conan/profiles/scwx-linux_clang-18
@@ -0,0 +1,8 @@
+[settings]
+arch=x86_64
+build_type=Release
+compiler=clang
+compiler.cppstd=20
+compiler.libcxx=libstdc++11
+compiler.version=18
+os=Linux
diff --git a/tools/conan/profiles/scwx-linux_clang-18_armv8 b/tools/conan/profiles/scwx-linux_clang-18_armv8
new file mode 100644
index 00000000..8c567fd4
--- /dev/null
+++ b/tools/conan/profiles/scwx-linux_clang-18_armv8
@@ -0,0 +1,8 @@
+[settings]
+arch=armv8
+build_type=Release
+compiler=clang
+compiler.cppstd=20
+compiler.libcxx=libstdc++11
+compiler.version=18
+os=Linux