diff --git a/.github/workflows/linux-qt6-drivers.yml b/.github/workflows/linux-qt6-drivers.yml
index fb89bebe2..3b017affe 100644
--- a/.github/workflows/linux-qt6-drivers.yml
+++ b/.github/workflows/linux-qt6-drivers.yml
@@ -114,10 +114,16 @@ jobs:
       env:
         DB_MYSQL_PASSWORD: ${{ secrets.DB_MYSQL_PASSWORD_SELF }}
 
-    - name: Ninja install latest version
-      uses: seanmiddleditch/gha-setup-ninja@master
+    # - name: Ninja install latest version
+    #   uses: seanmiddleditch/gha-setup-ninja@master
+    #   with:
+    #     destination: ${{ env.TinyRunnerWorkPath }}/ninja-build
+
+    - name: CMake and Ninja install latest versions
+      uses: lukka/get-cmake@latest
       with:
-        destination: ${{ env.TinyRunnerWorkPath }}/ninja-build
+        useLocalCache: true
+        useCloudCache: false
 
     # Don't use the default CCACHE_DIR path on self-hosted runners
     - name: Ccache prepare environment
diff --git a/.github/workflows/vcpkg-linux.yml b/.github/workflows/vcpkg-linux.yml
index a47435c81..0f812b783 100644
--- a/.github/workflows/vcpkg-linux.yml
+++ b/.github/workflows/vcpkg-linux.yml
@@ -107,14 +107,14 @@ jobs:
         sudo apt install --yes '^libxcb.*-dev' libx11-xcb-dev libglu1-mesa-dev libxrender-dev
         libxi-dev libxkbcommon-dev libxkbcommon-x11-dev
 
-    - name: Ninja install latest version
-      if: env.TinyIsSelfHostedRunner == 'true'
-      uses: seanmiddleditch/gha-setup-ninja@master
-      with:
-        destination: ${{ env.TinyRunnerWorkPath }}/ninja-build
+    # - name: Ninja install latest version
+    #   if: env.TinyIsSelfHostedRunner == 'true'
+    #   uses: seanmiddleditch/gha-setup-ninja@master
+    #   with:
+    #     destination: ${{ env.TinyRunnerWorkPath }}/ninja-build
 
     - name: CMake and Ninja install latest versions
-      if: env.TinyIsSelfHostedRunner == 'false'
+      # if: env.TinyIsSelfHostedRunner == 'false'
       uses: lukka/get-cmake@latest
       with:
         useLocalCache: true
diff --git a/.github/workflows/vcpkg-windows-drivers.yml b/.github/workflows/vcpkg-windows-drivers.yml
index 3e9060e15..608fa1a21 100644
--- a/.github/workflows/vcpkg-windows-drivers.yml
+++ b/.github/workflows/vcpkg-windows-drivers.yml
@@ -106,10 +106,16 @@ jobs:
       run: |
         mysql.exe --version
 
-    - name: Ninja install latest version
-      uses: seanmiddleditch/gha-setup-ninja@master
+    # - name: Ninja install latest version
+    #   uses: seanmiddleditch/gha-setup-ninja@master
+    #   with:
+    #     destination: ${{ env.TinyRunnerWorkPath }}/ninja-build
+
+    - name: CMake and Ninja install latest versions
+      uses: lukka/get-cmake@latest
       with:
-        destination: ${{ env.TinyRunnerWorkPath }}/ninja-build
+        useLocalCache: true
+        useCloudCache: false
 
     - name: Visual Studio 2022 pwsh shell setup
       uses: ilammy/msvc-dev-cmd@v1