diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index c2d3c49..47f38b9 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -13,7 +13,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        cmake: [3.19.7, latestrc]
+        # [minimum version, latest stable, latest release candidate]
+        cmake: [3.19.7, 3.31.9, latest, latestrc]
 
     env:
       cmake_version: ${{ matrix.cmake }}
@@ -36,7 +37,7 @@ jobs:
 
       - name: Build Catch2
         run: |
-          prefix=`pwd`/catch2_install
+          prefix=$PWD/catch2_install
           cd catch2
           cmake -H. -Bbuild -DCMAKE_INSTALL_PREFIX="${prefix}"
           cmake --build build --parallel 2
diff --git a/.github/workflows/unit_test.yml b/.github/workflows/unit_test.yml
index 920d3e8..018fdc2 100644
--- a/.github/workflows/unit_test.yml
+++ b/.github/workflows/unit_test.yml
@@ -13,33 +13,30 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        cmake: [3.19.7, 3.22.4, 3.23.1]
+        # [minimum version, last 3.x, latest stable, latest release candidate]
+        cmake: [3.19.7, 3.31.9, latest, latestrc]
 
     env:
       cmake_version: ${{ matrix.cmake }}
       os: linux-x86_64
 
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout repository
+        uses: actions/checkout@v3
 
-      - name: get cmake
-        env:
-          url_prefix: https://github.com/Kitware/CMake/releases/download
-        run: |
-          cmake_prefix=cmake-${cmake_version}-${os}
-          cmake_script=${cmake_prefix}.sh
-          wget "${url_prefix}/v${cmake_version}/${cmake_script}"
-          mkdir -p ./${cmake_prefix}
-          /bin/sh "${cmake_script}" --prefix=./${cmake_prefix} --exclude-subdir
+      - name: Get CMake and Ninja
+        uses: lukka/get-cmake@latest
+        with:
+          cmakeVersion: ${{ env.cmake_version }}
 
-      - name: configure
+      - name: Configure Project
         run: |
-          cmake-${cmake_version}-${os}/bin/cmake -H. -Bbuild -DBUILD_TESTING=ON
+          cmake -H. -Bbuild -DBUILD_TESTING=ON
 
-      - name: unit_test
+      - name: Unit Tests
         run: |
           cd build
-          ../cmake-${cmake_version}-${os}/bin/ctest \
+          ctest \
               j 2 \
               --output-on-failure \
               -LE integration_tests