diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml
index 3a2382ed49..1e1316d3b4 100644
--- a/.github/workflows/clang-tidy.yml
+++ b/.github/workflows/clang-tidy.yml
@@ -9,13 +9,14 @@ on:
 jobs:
   ResInsight-x64-buildcache:
     runs-on: ${{ matrix.config.os }}
+    continue-on-error: true
     strategy:
       fail-fast: false
       matrix:
         config:
           - {
-              name: "Ubuntu 20.04",
-              os: ubuntu-20.04,
+              name: "Ubuntu 22.04",
+              os: ubuntu-22.04,
               cc: "gcc",
               cxx: "g++",
               vcpkg-response-file: vcpkg_x64-linux.txt,
@@ -60,30 +61,30 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake -DCMAKE_TOOLCHAIN_FILE=${{ matrix.config.cmake-toolchain }}  -DCMAKE_EXPORT_COMPILE_COMMANDS=ON ..
-          sudo apt-get install clang-tidy
+          cmake -DCMAKE_TOOLCHAIN_FILE=${{ matrix.config.cmake-toolchain }} -DRESINSIGHT_USE_OPENMP=OFF -DCMAKE_EXPORT_COMPILE_COMMANDS=ON ..
+          sudo apt-get install clang-tidy-15
           mv compile_commands.json compile_commands_original.json
           python ../scripts/fix_json_database.py compile_commands_original.json >> compile_commands.json
       - name: clang-tidy on ApplicationLibCode/Application
         run: |
           cd build
-          run-clang-tidy -fix files ApplicationLibCode/Application
+          run-clang-tidy-15 -fix files ApplicationLibCode/Application
       - name: clang-tidy on ApplicationLibCode/ProjectDataModel
         run: |
           cd build
-          run-clang-tidy -fix files ApplicationLibCode/ProjectDataModel
+          run-clang-tidy-15 -fix files ApplicationLibCode/ProjectDataModel
       - name: clang-tidy on ApplicationLibCode/ReservoirDataModel
         run: |
           cd build
-          run-clang-tidy -fix files ApplicationLibCode/ReservoirDataModel
+          run-clang-tidy-15 -fix files ApplicationLibCode/ReservoirDataModel
       - name: clang-tidy on ApplicationLibCode/Commands
         run: |
           cd build
-          run-clang-tidy -fix files ApplicationLibCode/Commands
+          run-clang-tidy-15 -fix files ApplicationLibCode/Commands
       - name: clang-tidy on ApplicationLibCode/GeoMech
         run: |
           cd build
-          run-clang-tidy -fix files ApplicationLibCode/GeoMech
+          run-clang-tidy-15 -fix files ApplicationLibCode/GeoMech
       - name: Remove Qt before creating PR
         run: |
           rm -rf Qt
diff --git a/ApplicationLibCode/.clang-tidy b/ApplicationLibCode/.clang-tidy
index 6274e8b500..56c993e045 100644
--- a/ApplicationLibCode/.clang-tidy
+++ b/ApplicationLibCode/.clang-tidy
@@ -1,5 +1,5 @@
 ---
-Checks:            '-*,modernize-use-override,modernize-use-nullptr,modernize-deprecated-headers,bugprone-bool-pointer-implicit-conversion,bugprone-parent-virtual-call,bugprone-redundant-branch-condition,bugprone-suspicious-semicolon,bugprone-suspicious-string-compare'
+Checks:            '-*,modernize-use-override,modernize-deprecated-headers,bugprone-bool-pointer-implicit-conversion,bugprone-parent-virtual-call,bugprone-redundant-branch-condition,bugprone-suspicious-semicolon,bugprone-suspicious-string-compare'
 WarningsAsErrors:  ''
 HeaderFilterRegex: 'ApplicationLibCode/*.*$'
 FormatStyle:       'file'