diff --git a/azure-pipelines-nightly.yml b/azure-pipelines-nightly.yml
index 1baeeab991..28d6b33531 100644
--- a/azure-pipelines-nightly.yml
+++ b/azure-pipelines-nightly.yml
@@ -302,6 +302,7 @@ jobs:
       - template: azure-pipelines-templates/build-preparations.yml
       - template: azure-pipelines-templates/nb-gitversioning.yml
       - template: azure-pipelines-templates/download-install-arm-gcc-toolchain.yml
+      - template: azure-pipelines-templates/download-install-ninja.yml
       - template: azure-pipelines-templates/download-srecord.yml
       - template: azure-pipelines-templates/download-hexdfu.yml
       - template: azure-pipelines-templates/build-chibios-stm32-targets.yml
@@ -670,7 +671,6 @@ jobs:
     steps:
       - template: azure-pipelines-templates/build-preparations.yml
       - template: azure-pipelines-templates/nb-gitversioning.yml
-      - template: azure-pipelines-templates/download-install-cmake.yml
       - template: azure-pipelines-templates/download-install-arm-gcc-toolchain.yml
       - template: azure-pipelines-templates/download-install-ninja.yml
       - template: azure-pipelines-templates/build-ti-simplelink-targets.yml
diff --git a/azure-pipelines-templates/download-install-ninja.yml b/azure-pipelines-templates/download-install-ninja.yml
index 7021786424..62ab14a9f0 100644
--- a/azure-pipelines-templates/download-install-ninja.yml
+++ b/azure-pipelines-templates/download-install-ninja.yml
@@ -7,28 +7,7 @@ parameters:
     default: $(Build.SourcesDirectory)
 
 steps:
-  - task: Cache@2
-    inputs:
-      key: "1-12-1 | ninjaKey"
-      restoreKeys: ninjaKey
-      path: $(Agent.TempDirectory)/ninja
-      cacheHitVar: NINJA_CACHE_RESTORED
-    displayName: Cache Ninja
 
-  - task: PowerShell@2
-    condition: ne(variables.NINJA_CACHE_RESTORED, 'true')
-    displayName: Download Ninja
-    inputs:
-      targetType: "filePath"
-      filePath: '${{ parameters.repoDirectory }}\install-scripts\install-ninja.ps1'
-      failOnStderr: true
-
-  - task: ExtractFiles@1
-    inputs:
-      archiveFilePatterns: '$(Agent.TempDirectory)\ninja.zip'
-      destinationFolder: '$(Agent.TempDirectory)\ninja'
-    condition: ne(variables.NINJA_CACHE_RESTORED, 'true')
-    displayName: Extract Ninja
-
-  - script: echo "##vso[task.prependpath]$(Agent.TempDirectory)\ninja"
-    displayName: Tweak PATH with Ninja
+  - script: |
+      ninja --version
+    displayName: Ninja Version Check
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 5549dc240a..73bc69ab3f 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -417,6 +417,7 @@ jobs:
       - template: azure-pipelines-templates/build-preparations.yml
       - template: azure-pipelines-templates/nb-gitversioning.yml
       - template: azure-pipelines-templates/download-install-arm-gcc-toolchain.yml
+      - template: azure-pipelines-templates/download-install-ninja.yml
       - template: azure-pipelines-templates/download-srecord.yml
       - template: azure-pipelines-templates/download-hexdfu.yml
       - template: azure-pipelines-templates/build-chibios-stm32-targets.yml
@@ -618,6 +619,7 @@ jobs:
       - template: azure-pipelines-templates/build-preparations.yml
       - template: azure-pipelines-templates/nb-gitversioning.yml
       - template: azure-pipelines-templates/download-install-arm-gcc-toolchain.yml
+      - template: azure-pipelines-templates/download-install-ninja.yml
       - template: azure-pipelines-templates/download-srecord.yml
       - template: azure-pipelines-templates/build-freertos-nxp-targets.yml
       - template: azure-pipelines-templates/pack-publish-artifacts.yml
@@ -694,7 +696,6 @@ jobs:
     steps:
       - template: azure-pipelines-templates/build-preparations.yml
       - template: azure-pipelines-templates/nb-gitversioning.yml
-      - template: azure-pipelines-templates/download-install-cmake.yml
       - template: azure-pipelines-templates/download-install-arm-gcc-toolchain.yml
       - template: azure-pipelines-templates/download-install-ninja.yml
       - template: azure-pipelines-templates/build-ti-simplelink-targets.yml
@@ -767,6 +768,7 @@ jobs:
       - template: azure-pipelines-templates/build-preparations.yml
       - template: azure-pipelines-templates/nb-gitversioning.yml
       - template: azure-pipelines-templates/download-install-arm-gcc-toolchain.yml
+      - template: azure-pipelines-templates/download-install-ninja.yml
       - template: azure-pipelines-templates/download-hexdfu.yml
       - template: azure-pipelines-templates/download-srecord.yml
       - template: azure-pipelines-templates/build-azurertos-targets.yml