diff --git a/.github/workflows/shared-e2e.yml b/.github/workflows/shared-e2e.yml
index 129bce46..74fc384f 100644
--- a/.github/workflows/shared-e2e.yml
+++ b/.github/workflows/shared-e2e.yml
@@ -53,10 +53,8 @@ jobs:
         shell: bash
         run: |
           base_matrix='${{ steps.test-matrix-base.outputs.matrix }}'
-          # Read CMake version from vcpkg config
-          vcpkg_cmake_version=$(jq -r '.requires."arm:tools/kitware/cmake"' ./test/vcpkg-configuration.json)
-          echo "CMake version from vcpkg config: $vcpkg_cmake_version"
-          cmake_versions="[\"$vcpkg_cmake_version\", \"4.2.1\"]"
+          # Test both CMake versions via workflow matrix
+          cmake_versions="[\"3.31.12\", \"4.3.3\"]"
           # base_matrix is expected to be: { "include": [ ... ] }
           # produce: { "include": [ {..config.., cmake_version: ..}, ... ] }
           result=$(jq -nc \
@@ -426,42 +424,19 @@ jobs:
             python -m pip install --upgrade pip
             pip install -r test/e2e/requirements.txt
 
-      - name: Create vcpkg config without CMake
-        if: matrix.cmake_version != '3.31.5'
+      - name: Prepare vcpkg config with CMake ${{ matrix.cmake_version }}
         shell: bash
         run: |
-          jq 'del(.requires."arm:tools/kitware/cmake")' ./test/vcpkg-configuration.json > ./test/vcpkg-configuration-temp.json
+          jq '.requires."arm:tools/kitware/cmake" = "${{ matrix.cmake_version }}"' \
+            ./test/vcpkg-configuration.json > ./test/vcpkg-configuration-temp.json
 
       - name: Setup vcpkg environment
-        if: matrix.cmake_version == '3.31.5'
-        uses: ARM-software/cmsis-actions/vcpkg@1ab1da03e6e9787dc903bcf041ba541e59b5739f # v1
-        with:
-          config: "./test/vcpkg-configuration.json"
-          vcpkg-downloads: "${{ github.workspace }}/.vcpkg/downloads"
-          cache: "-"
-
-      - name: Setup vcpkg environment (without CMake)
-        if: matrix.cmake_version != '3.31.5'
         uses: ARM-software/cmsis-actions/vcpkg@1ab1da03e6e9787dc903bcf041ba541e59b5739f # v1
         with:
           config: "./test/vcpkg-configuration-temp.json"
           vcpkg-downloads: "${{ github.workspace }}/.vcpkg/downloads"
           cache: "-"
 
-      # Overlay CMake for non-vcpkg runs (no need to mutate the vcpkg config)
-      - name: Install CMake ${{ matrix.cmake_version }} (amd64)
-        if: matrix.cmake_version != '3.31.5' && matrix.arch == 'amd64'
-        uses: jwlawson/actions-setup-cmake@0d6a7d60b009d01c9e7523be22153ff8f19460d3 # v2.2.0
-        with:
-          cmake-version: '${{ matrix.cmake_version }}'
-
-      - name: Install CMake ${{ matrix.cmake_version }} (arm64)
-        if: matrix.cmake_version != '3.31.5' && matrix.arch == 'arm64'
-        shell: bash
-        run: |
-          # Install CMake via pip for ARM64 compatibility
-          pip install cmake==${{ matrix.cmake_version }}
-
       - name: Confirm CMake selected
         shell: bash
         run: |
@@ -570,10 +545,10 @@ jobs:
         python -m robot.rebot --name Collective_Robot_Results \
             --outputdir collective_robot_results \
             --output output.xml \
-            ./reports-windows-amd64-cmake3.31.5/output.xml \
-            ./reports-windows-amd64-cmake4.2.1/output.xml \
-            ./reports-linux-amd64-cmake3.31.5/output.xml \
-            ./reports-linux-amd64-cmake4.2.1/output.xml
+            ./reports-windows-amd64-cmake3.31.12/output.xml \
+            ./reports-windows-amd64-cmake4.3.3/output.xml \
+            ./reports-linux-amd64-cmake3.31.12/output.xml \
+            ./reports-linux-amd64-cmake4.3.3/output.xml
 
     - name: Generate Summary report
       if: always()
diff --git a/.github/workflows/toolbox.yml b/.github/workflows/toolbox.yml
index 28d5bd01..58310866 100644
--- a/.github/workflows/toolbox.yml
+++ b/.github/workflows/toolbox.yml
@@ -66,10 +66,8 @@ jobs:
         id: test-matrix
         run: |
           base_matrix='${{ steps.test-matrix-base.outputs.matrix }}'
-          # Read CMake version from vcpkg config
-          vcpkg_cmake_version=$(jq -r '.requires."arm:tools/kitware/cmake"' ./test/vcpkg-configuration.json)
-          echo "CMake version from vcpkg config: $vcpkg_cmake_version"
-          cmake_versions="[\"$vcpkg_cmake_version\", \"4.2.1\"]"
+          # Test both CMake versions via workflow matrix
+          cmake_versions="[\"3.31.12\", \"4.3.3\"]"
           # base_matrix is expected to be: { "include": [ ... ] }
           # produce: { "include": [ {..config.., cmake_version: ..}, ... ] }
           result=$(jq -nc \
@@ -528,40 +526,18 @@ jobs:
             python -m pip install --upgrade pip
             pip install -r test/e2e/requirements.txt
 
-      - name: Create vcpkg config without CMake
-        if: matrix.cmake_version != '3.31.5'
+      - name: Prepare vcpkg config with CMake ${{ matrix.cmake_version }}
         run: |
-          jq 'del(.requires."arm:tools/kitware/cmake")' ./test/vcpkg-configuration.json > ./test/vcpkg-configuration-temp.json
+          jq '.requires."arm:tools/kitware/cmake" = "${{ matrix.cmake_version }}" | .requires."arm:tools/ninja-build/ninja" = "1.13.2"' \
+            ./test/vcpkg-configuration.json > ./test/vcpkg-configuration-temp.json
 
       - name: Setup vcpkg environment
-        if: matrix.cmake_version == '3.31.5'
-        uses: ARM-software/cmsis-actions/vcpkg@1ab1da03e6e9787dc903bcf041ba541e59b5739f # v1
-        with:
-          config: "./test/vcpkg-configuration.json"
-          vcpkg-downloads: "${{ github.workspace }}/.vcpkg/downloads"
-          cache: "-"
-
-      - name: Setup vcpkg environment (without CMake)
-        if: matrix.cmake_version != '3.31.5'
         uses: ARM-software/cmsis-actions/vcpkg@1ab1da03e6e9787dc903bcf041ba541e59b5739f # v1
         with:
           config: "./test/vcpkg-configuration-temp.json"
           vcpkg-downloads: "${{ github.workspace }}/.vcpkg/downloads"
           cache: "-"
 
-      # Overlay CMake for non-vcpkg runs (no need to mutate the vcpkg config)
-      - name: Install CMake ${{ matrix.cmake_version }} (amd64)
-        if: matrix.cmake_version != '3.31.5' && matrix.arch == 'amd64'
-        uses: jwlawson/actions-setup-cmake@0d6a7d60b009d01c9e7523be22153ff8f19460d3 # v2.2.0
-        with:
-          cmake-version: '${{ matrix.cmake_version }}'
-
-      - name: Install CMake ${{ matrix.cmake_version }} (arm64)
-        if: matrix.cmake_version != '3.31.5' && matrix.arch == 'arm64'
-        run: |
-          # Install CMake via pip for ARM64 compatibility
-          pip install cmake==${{ matrix.cmake_version }}
-
       - name: Confirm CMake selected
         run: |
           echo "cmake_version matrix value: ${{ matrix.cmake_version }}"
diff --git a/test/e2e/reference.md b/test/e2e/reference.md
index 9e2969b3..4c060e17 100644
--- a/test/e2e/reference.md
+++ b/test/e2e/reference.md
@@ -10,67 +10,67 @@
 
 |Tag|Test|:clock1030: Duration|Suite|
 |:---:|:---:|:---:|:---:|
-|windows-amd64-cmake3.31.5|Validate build-asm Example|22.30 s|Local Example Tests|
-|windows-amd64-cmake3.31.5|Validate build-c Example|9.72 s|Local Example Tests|
-|windows-amd64-cmake3.31.5|Validate build-cpp Example|14.60 s|Local Example Tests|
-|windows-amd64-cmake3.31.5|Validate build-set Example|4.60 s|Local Example Tests|
-|windows-amd64-cmake3.31.5|Validate executes Example|3.81 s|Local Example Tests|
-|windows-amd64-cmake3.31.5|Validate include-define Example|13.07 s|Local Example Tests|
-|windows-amd64-cmake3.31.5|Validate language-scope Example|13.64 s|Local Example Tests|
-|windows-amd64-cmake3.31.5|Validate linker-pre-processing Example|10.10 s|Local Example Tests|
-|windows-amd64-cmake3.31.5|Validate pre-include Example|10.55 s|Local Example Tests|
-|windows-amd64-cmake3.31.5|Validate whitespace Example|9.90 s|Local Example Tests|
-|windows-amd64-cmake3.31.5|Validate trustzone Example|37.85 s|Local Example Tests|
-|windows-amd64-cmake3.31.5|Hello_FRDM-K32L3A6|32.06 s|Remote Example Tests|
-|windows-amd64-cmake3.31.5|Hello_LPCXpresso55S69|24.64 s|Remote Example Tests|
-|windows-amd64-cmake3.31.5|Csolution-examples|116.44 s|Remote Example Tests|
-|windows-amd64-cmake3.31.5|keil-studio-get-started|8.19 s|Remote Example Tests|
-|windows-amd64-cmake3.31.5|AVH-VSI|73.83 s|Remote Example Tests|
-|windows-amd64-cmake4.2.1|Validate build-asm Example|20.91 s|Local Example Tests|
-|windows-amd64-cmake4.2.1|Validate build-c Example|9.08 s|Local Example Tests|
-|windows-amd64-cmake4.2.1|Validate build-cpp Example|14.15 s|Local Example Tests|
-|windows-amd64-cmake4.2.1|Validate build-set Example|4.31 s|Local Example Tests|
-|windows-amd64-cmake4.2.1|Validate executes Example|3.63 s|Local Example Tests|
-|windows-amd64-cmake4.2.1|Validate include-define Example|13.03 s|Local Example Tests|
-|windows-amd64-cmake4.2.1|Validate language-scope Example|12.59 s|Local Example Tests|
-|windows-amd64-cmake4.2.1|Validate linker-pre-processing Example|9.09 s|Local Example Tests|
-|windows-amd64-cmake4.2.1|Validate pre-include Example|9.22 s|Local Example Tests|
-|windows-amd64-cmake4.2.1|Validate whitespace Example|8.85 s|Local Example Tests|
-|windows-amd64-cmake4.2.1|Validate trustzone Example|39.44 s|Local Example Tests|
-|windows-amd64-cmake4.2.1|Hello_FRDM-K32L3A6|31.20 s|Remote Example Tests|
-|windows-amd64-cmake4.2.1|Hello_LPCXpresso55S69|24.12 s|Remote Example Tests|
-|windows-amd64-cmake4.2.1|Csolution-examples|113.61 s|Remote Example Tests|
-|windows-amd64-cmake4.2.1|keil-studio-get-started|7.86 s|Remote Example Tests|
-|windows-amd64-cmake4.2.1|AVH-VSI|73.77 s|Remote Example Tests|
-|linux-amd64-cmake3.31.5|Validate build-asm Example|8.88 s|Local Example Tests|
-|linux-amd64-cmake3.31.5|Validate build-c Example|3.60 s|Local Example Tests|
-|linux-amd64-cmake3.31.5|Validate build-cpp Example|5.47 s|Local Example Tests|
-|linux-amd64-cmake3.31.5|Validate build-set Example|1.96 s|Local Example Tests|
-|linux-amd64-cmake3.31.5|Validate executes Example|1.46 s|Local Example Tests|
-|linux-amd64-cmake3.31.5|Validate include-define Example|4.70 s|Local Example Tests|
-|linux-amd64-cmake3.31.5|Validate language-scope Example|4.69 s|Local Example Tests|
-|linux-amd64-cmake3.31.5|Validate linker-pre-processing Example|3.59 s|Local Example Tests|
-|linux-amd64-cmake3.31.5|Validate pre-include Example|3.79 s|Local Example Tests|
-|linux-amd64-cmake3.31.5|Validate whitespace Example|3.57 s|Local Example Tests|
-|linux-amd64-cmake3.31.5|Validate trustzone Example|10.58 s|Local Example Tests|
-|linux-amd64-cmake3.31.5|Hello_FRDM-K32L3A6|15.06 s|Remote Example Tests|
-|linux-amd64-cmake3.31.5|Hello_LPCXpresso55S69|12.66 s|Remote Example Tests|
-|linux-amd64-cmake3.31.5|Csolution-examples|65.13 s|Remote Example Tests|
-|linux-amd64-cmake3.31.5|keil-studio-get-started|4.85 s|Remote Example Tests|
-|linux-amd64-cmake3.31.5|AVH-VSI|33.10 s|Remote Example Tests|
-|linux-amd64-cmake4.2.1|Validate build-asm Example|8.97 s|Local Example Tests|
-|linux-amd64-cmake4.2.1|Validate build-c Example|4.31 s|Local Example Tests|
-|linux-amd64-cmake4.2.1|Validate build-cpp Example|5.21 s|Local Example Tests|
-|linux-amd64-cmake4.2.1|Validate build-set Example|2.15 s|Local Example Tests|
-|linux-amd64-cmake4.2.1|Validate executes Example|1.52 s|Local Example Tests|
-|linux-amd64-cmake4.2.1|Validate include-define Example|4.32 s|Local Example Tests|
-|linux-amd64-cmake4.2.1|Validate language-scope Example|4.89 s|Local Example Tests|
-|linux-amd64-cmake4.2.1|Validate linker-pre-processing Example|3.83 s|Local Example Tests|
-|linux-amd64-cmake4.2.1|Validate pre-include Example|4.01 s|Local Example Tests|
-|linux-amd64-cmake4.2.1|Validate whitespace Example|3.71 s|Local Example Tests|
-|linux-amd64-cmake4.2.1|Validate trustzone Example|12.16 s|Local Example Tests|
-|linux-amd64-cmake4.2.1|Hello_FRDM-K32L3A6|18.19 s|Remote Example Tests|
-|linux-amd64-cmake4.2.1|Hello_LPCXpresso55S69|13.01 s|Remote Example Tests|
-|linux-amd64-cmake4.2.1|Csolution-examples|69.72 s|Remote Example Tests|
-|linux-amd64-cmake4.2.1|keil-studio-get-started|4.74 s|Remote Example Tests|
-|linux-amd64-cmake4.2.1|AVH-VSI|33.58 s|Remote Example Tests|
+|windows-amd64-cmake3.31.12|Validate build-asm Example|22.30 s|Local Example Tests|
+|windows-amd64-cmake3.31.12|Validate build-c Example|9.72 s|Local Example Tests|
+|windows-amd64-cmake3.31.12|Validate build-cpp Example|14.60 s|Local Example Tests|
+|windows-amd64-cmake3.31.12|Validate build-set Example|4.60 s|Local Example Tests|
+|windows-amd64-cmake3.31.12|Validate executes Example|3.81 s|Local Example Tests|
+|windows-amd64-cmake3.31.12|Validate include-define Example|13.07 s|Local Example Tests|
+|windows-amd64-cmake3.31.12|Validate language-scope Example|13.64 s|Local Example Tests|
+|windows-amd64-cmake3.31.12|Validate linker-pre-processing Example|10.10 s|Local Example Tests|
+|windows-amd64-cmake3.31.12|Validate pre-include Example|10.55 s|Local Example Tests|
+|windows-amd64-cmake3.31.12|Validate whitespace Example|9.90 s|Local Example Tests|
+|windows-amd64-cmake3.31.12|Validate trustzone Example|37.85 s|Local Example Tests|
+|windows-amd64-cmake3.31.12|Hello_FRDM-K32L3A6|32.06 s|Remote Example Tests|
+|windows-amd64-cmake3.31.12|Hello_LPCXpresso55S69|24.64 s|Remote Example Tests|
+|windows-amd64-cmake3.31.12|Csolution-examples|116.44 s|Remote Example Tests|
+|windows-amd64-cmake3.31.12|keil-studio-get-started|8.19 s|Remote Example Tests|
+|windows-amd64-cmake3.31.12|AVH-VSI|73.83 s|Remote Example Tests|
+|windows-amd64-cmake4.3.3|Validate build-asm Example|20.91 s|Local Example Tests|
+|windows-amd64-cmake4.3.3|Validate build-c Example|9.08 s|Local Example Tests|
+|windows-amd64-cmake4.3.3|Validate build-cpp Example|14.15 s|Local Example Tests|
+|windows-amd64-cmake4.3.3|Validate build-set Example|4.31 s|Local Example Tests|
+|windows-amd64-cmake4.3.3|Validate executes Example|3.63 s|Local Example Tests|
+|windows-amd64-cmake4.3.3|Validate include-define Example|13.03 s|Local Example Tests|
+|windows-amd64-cmake4.3.3|Validate language-scope Example|12.59 s|Local Example Tests|
+|windows-amd64-cmake4.3.3|Validate linker-pre-processing Example|9.09 s|Local Example Tests|
+|windows-amd64-cmake4.3.3|Validate pre-include Example|9.22 s|Local Example Tests|
+|windows-amd64-cmake4.3.3|Validate whitespace Example|8.85 s|Local Example Tests|
+|windows-amd64-cmake4.3.3|Validate trustzone Example|39.44 s|Local Example Tests|
+|windows-amd64-cmake4.3.3|Hello_FRDM-K32L3A6|31.20 s|Remote Example Tests|
+|windows-amd64-cmake4.3.3|Hello_LPCXpresso55S69|24.12 s|Remote Example Tests|
+|windows-amd64-cmake4.3.3|Csolution-examples|113.61 s|Remote Example Tests|
+|windows-amd64-cmake4.3.3|keil-studio-get-started|7.86 s|Remote Example Tests|
+|windows-amd64-cmake4.3.3|AVH-VSI|73.77 s|Remote Example Tests|
+|linux-amd64-cmake3.31.12|Validate build-asm Example|8.88 s|Local Example Tests|
+|linux-amd64-cmake3.31.12|Validate build-c Example|3.60 s|Local Example Tests|
+|linux-amd64-cmake3.31.12|Validate build-cpp Example|5.47 s|Local Example Tests|
+|linux-amd64-cmake3.31.12|Validate build-set Example|1.96 s|Local Example Tests|
+|linux-amd64-cmake3.31.12|Validate executes Example|1.46 s|Local Example Tests|
+|linux-amd64-cmake3.31.12|Validate include-define Example|4.70 s|Local Example Tests|
+|linux-amd64-cmake3.31.12|Validate language-scope Example|4.69 s|Local Example Tests|
+|linux-amd64-cmake3.31.12|Validate linker-pre-processing Example|3.59 s|Local Example Tests|
+|linux-amd64-cmake3.31.12|Validate pre-include Example|3.79 s|Local Example Tests|
+|linux-amd64-cmake3.31.12|Validate whitespace Example|3.57 s|Local Example Tests|
+|linux-amd64-cmake3.31.12|Validate trustzone Example|10.58 s|Local Example Tests|
+|linux-amd64-cmake3.31.12|Hello_FRDM-K32L3A6|15.06 s|Remote Example Tests|
+|linux-amd64-cmake3.31.12|Hello_LPCXpresso55S69|12.66 s|Remote Example Tests|
+|linux-amd64-cmake3.31.12|Csolution-examples|65.13 s|Remote Example Tests|
+|linux-amd64-cmake3.31.12|keil-studio-get-started|4.85 s|Remote Example Tests|
+|linux-amd64-cmake3.31.12|AVH-VSI|33.10 s|Remote Example Tests|
+|linux-amd64-cmake4.3.3|Validate build-asm Example|8.97 s|Local Example Tests|
+|linux-amd64-cmake4.3.3|Validate build-c Example|4.31 s|Local Example Tests|
+|linux-amd64-cmake4.3.3|Validate build-cpp Example|5.21 s|Local Example Tests|
+|linux-amd64-cmake4.3.3|Validate build-set Example|2.15 s|Local Example Tests|
+|linux-amd64-cmake4.3.3|Validate executes Example|1.52 s|Local Example Tests|
+|linux-amd64-cmake4.3.3|Validate include-define Example|4.32 s|Local Example Tests|
+|linux-amd64-cmake4.3.3|Validate language-scope Example|4.89 s|Local Example Tests|
+|linux-amd64-cmake4.3.3|Validate linker-pre-processing Example|3.83 s|Local Example Tests|
+|linux-amd64-cmake4.3.3|Validate pre-include Example|4.01 s|Local Example Tests|
+|linux-amd64-cmake4.3.3|Validate whitespace Example|3.71 s|Local Example Tests|
+|linux-amd64-cmake4.3.3|Validate trustzone Example|12.16 s|Local Example Tests|
+|linux-amd64-cmake4.3.3|Hello_FRDM-K32L3A6|18.19 s|Remote Example Tests|
+|linux-amd64-cmake4.3.3|Hello_LPCXpresso55S69|13.01 s|Remote Example Tests|
+|linux-amd64-cmake4.3.3|Csolution-examples|69.72 s|Remote Example Tests|
+|linux-amd64-cmake4.3.3|keil-studio-get-started|4.74 s|Remote Example Tests|
+|linux-amd64-cmake4.3.3|AVH-VSI|33.58 s|Remote Example Tests|
diff --git a/test/vcpkg-configuration.json b/test/vcpkg-configuration.json
index 8cd4ae99..a29bc8da 100644
--- a/test/vcpkg-configuration.json
+++ b/test/vcpkg-configuration.json
@@ -12,8 +12,7 @@
     }
   ],
   "requires": {
-    "arm:tools/kitware/cmake": "3.31.5",
-    "arm:tools/ninja-build/ninja": "1.12.0",
+    "arm:tools/ninja-build/ninja": "1.13.2",
     "arm:compilers/arm/armclang":"6.24.0",
     "arm:compilers/arm/arm-none-eabi-gcc": "14.2.1",
     "arm:tools/open-cmsis-pack/cmsis-toolbox": "2.12.0",