diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 35bce0452..f97dda7ec 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -582,8 +582,8 @@ jobs:
           cmake -B${{runner.workspace}}/build-clang-tidy \
           -DCMAKE_BUILD_TYPE:STRING=Release \
           -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
-          -DCMAKE_CXX_COMPILER:STRING=clang++-15 \
-          -DCMAKE_C_COMPILER:STRING=clang-15 \
+          -DCMAKE_CXX_COMPILER:STRING=clang++ \
+          -DCMAKE_C_COMPILER:STRING=clang \
           -DPELEC_ENABLE_MPI:BOOL=OFF \
           -DPELEC_ENABLE_FCOMPARE_FOR_TESTS:BOOL=OFF \
           -DPELEC_ENABLE_MASA:BOOL=OFF \
@@ -594,7 +594,7 @@ jobs:
         working-directory: ${{runner.workspace}}/build-clang-tidy
         run: |
           #set -eu -o pipefail
-          cmake --build . --parallel ${{env.NPROCS}} 2>&1 | tee -a clang-tidy-full-report.txt
+          cmake --build . --parallel 2 2>&1 | tee -a clang-tidy-full-report.txt
           egrep "warning:|error:" clang-tidy-full-report.txt \
             | egrep -v "Submodules/amrex|Submodules/sundials" \
             | egrep -v "ld: warning:" | sort | uniq \
diff --git a/CMake/PeleCUtils.cmake b/CMake/PeleCUtils.cmake
index 13b9f87a1..0065e7bd0 100644
--- a/CMake/PeleCUtils.cmake
+++ b/CMake/PeleCUtils.cmake
@@ -17,7 +17,7 @@ endfunction(target_link_libraries_system)
 
 macro(init_code_checks)
   if(PELEC_ENABLE_CLANG_TIDY)
-    find_program(CLANG_TIDY_EXE NAMES "clang-tidy-15")
+    find_program(CLANG_TIDY_EXE NAMES "clang-tidy")
     if(CLANG_TIDY_EXE)
       message(STATUS "clang-tidy found: ${CLANG_TIDY_EXE}")
     else()