diff --git a/.github/workflows/build-client.yml b/.github/workflows/build-client.yml
index 64c1ef480f..3a79241e74 100644
--- a/.github/workflows/build-client.yml
+++ b/.github/workflows/build-client.yml
@@ -38,8 +38,11 @@ jobs:
       run: |
         echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
         echo "hunter-dir=${{ github.workspace }}/.hunter" >> "$GITHUB_OUTPUT"
-        echo "cmake-version=3.27.9" >> "$GITHUB_OUTPUT"
-        echo "cmake-install-dir=/opt/cmake-3.27.9" >> "$GITHUB_OUTPUT"
+
+    - uses: lukka/get-cmake@v3.29.5
+      if: runner.os == 'Linux'
+      with:
+        cmakeVersion: 3.27.9
 
     - name: Dependencies Linux
       if: runner.os == 'Linux'
@@ -62,10 +65,6 @@ jobs:
         wget https://raw.githubusercontent.com/microsoft/msquic/main/src/inc/msquic_posix.h
         wget https://raw.githubusercontent.com/microsoft/msquic/main/src/inc/quic_sal_stub.h
         sudo mv msquic.h msquic_posix.h quic_sal_stub.h /usr/include/
-        wget --output-document=/tmp/cmake.sh https://github.com/Kitware/CMake/releases/download/v${{ steps.strings.outputs.cmake-version }}/cmake-${{ steps.strings.outputs.cmake-version }}-linux-x86_64.sh
-        sudo mkdir ${{ steps.strings.outputs.cmake-install-dir }}
-        sudo sh /tmp/cmake.sh --skip-license --prefix=${{ steps.strings.outputs.cmake-install-dir }}
-        sudo ln --symbolic --force ${{ steps.strings.outputs.cmake-install-dir }}/bin/cmake /usr/local/bin/cmake
 
     - name: Cache Hunter Dependencies
       uses: actions/cache@v4.0.2
@@ -86,8 +85,6 @@ jobs:
         choco install directx-sdk
 
     - name: Configure CMake
-      # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
-      # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
       run: >
         cmake --version;
         cmake -B ${{ steps.strings.outputs.build-output-dir }}
diff --git a/.github/workflows/cross-compile-client.yml b/.github/workflows/cross-compile-client.yml
index 92969ff835..79cdf7e9c1 100644
--- a/.github/workflows/cross-compile-client.yml
+++ b/.github/workflows/cross-compile-client.yml
@@ -19,11 +19,13 @@ jobs:
       run: |
         echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
         echo "hunter-dir=${{ github.workspace }}/.hunter" >> "$GITHUB_OUTPUT"
-        echo "cmake-version=3.27.9" >> "$GITHUB_OUTPUT"
-        echo "cmake-install-dir=/opt/cmake-3.27.9" >> "$GITHUB_OUTPUT"
         COMMIT_HASH=${{ github.sha }}
         echo "version=sha.${COMMIT_HASH:0:8}" >> "$GITHUB_OUTPUT"
 
+    - uses: lukka/get-cmake@v3.29.5
+      with:
+        cmakeVersion: 3.27.9
+
     - name: Dependencies
       run: |
         sudo apt update
@@ -38,10 +40,6 @@ jobs:
         mingw-w64 \
         mingw-w64-tools \
         ninja-build
-        wget --output-document=/tmp/cmake.sh https://github.com/Kitware/CMake/releases/download/v${{ steps.strings.outputs.cmake-version }}/cmake-${{ steps.strings.outputs.cmake-version }}-linux-x86_64.sh
-        sudo mkdir ${{ steps.strings.outputs.cmake-install-dir }}
-        sudo sh /tmp/cmake.sh --skip-license --prefix=${{ steps.strings.outputs.cmake-install-dir }}
-        sudo ln --symbolic --force ${{ steps.strings.outputs.cmake-install-dir }}/bin/cmake /usr/local/bin/cmake
         git clone --depth 1 --branch openssl-3.0.12 https://github.com/openssl/openssl.git
         cd openssl
         ./Configure mingw --cross-compile-prefix=i686-w64-mingw32- --prefix=/usr/i686-w64-mingw32
@@ -55,8 +53,6 @@ jobs:
         key: ubuntu-latest-hunter-cache
 
     - name: Configure CMake
-      # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
-      # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
       run: >
         cmake --version;
         cmake -B ${{ steps.strings.outputs.build-output-dir }}