diff --git a/.github/workflows/basic_checks.yml b/.github/workflows/basic_checks.yml
index f476d18ace..31752d6a55 100644
--- a/.github/workflows/basic_checks.yml
+++ b/.github/workflows/basic_checks.yml
@@ -221,8 +221,7 @@ jobs:
         name: cmake build
         run: |
           set -x
-          mbedtools configure -p ${{ env.ROOT}} -t ${{ env.TOOLCHAIN }} -m ${{ env.TARGET_NAME }} --mbed-os-path .
-          cmake -S ${{env.ROOT}} -B ${{ env.ROOT }}/cmake_build/${{env.TARGET_NAME}}/${{ env.PROFILE }}/${{ env.TOOLCHAIN }}/ -GNinja -DCMAKE_BUILD_TYPE=${{ env.PROFILE }}
+          cmake -S ${{env.ROOT}} -B ${{ env.ROOT }}/cmake_build/${{env.TARGET_NAME}}/${{ env.PROFILE }}/${{ env.TOOLCHAIN }}/ -GNinja -DCMAKE_BUILD_TYPE=${{ env.PROFILE }} -DMBED_TARGET=${{ env.TARGET_NAME }}
           cmake --build ${{ env.ROOT }}/cmake_build/${{ env.TARGET_NAME }}/${{ env.PROFILE }}/${{ env.TOOLCHAIN }}/
 
       -
diff --git a/.github/workflows/greentea_cmake.yml b/.github/workflows/greentea_cmake.yml
index e267c1ba67..005e5ac441 100644
--- a/.github/workflows/greentea_cmake.yml
+++ b/.github/workflows/greentea_cmake.yml
@@ -18,13 +18,11 @@ jobs:
       - name: Build NUCLEO_G031K8 with baremetal profile
         run: |
             rm -rf __build
-            mbedtools configure -t GCC_ARM -m NUCLEO_G031K8 --mbed-os-path . --output-dir __build --app-config TESTS/configs/baremetal.json
-            cmake -S . -B __build -GNinja -DCMAKE_CTEST_ARGUMENTS="--output-on-failure;-V" -DMBED_BUILD_GREENTEA_TESTS=ON -DMBED_GREENTEA_TEST_BAREMETAL=ON -DMBED_GREENTEA_SERIAL_PORT=/dev/ttyDUMMY
+            cmake -S . -B __build -GNinja -DCMAKE_CTEST_ARGUMENTS="--output-on-failure;-V" -DMBED_BUILD_GREENTEA_TESTS=ON -DMBED_GREENTEA_TEST_BAREMETAL=ON -DMBED_GREENTEA_SERIAL_PORT=/dev/ttyDUMMY -DMBED_TARGET=NUCLEO_G031K8 -DMBED_APP_JSON=TESTS/configs/baremetal.json
             cmake --build __build
 
       - name: Build ARM_MUSCA_S1 with full profile
         run: |
             rm -rf __build
-            mbedtools configure -t GCC_ARM -m ARM_MUSCA_S1 --mbed-os-path . --output-dir __build
-            cmake -S . -B __build -GNinja -DCMAKE_CTEST_ARGUMENTS="--output-on-failure;-V" -DMBED_BUILD_GREENTEA_TESTS=ON -DMBED_GREENTEA_SERIAL_PORT=/dev/ttyDUMMY
+            cmake -S . -B __build -GNinja -DCMAKE_CTEST_ARGUMENTS="--output-on-failure;-V" -DMBED_BUILD_GREENTEA_TESTS=ON -DMBED_GREENTEA_SERIAL_PORT=/dev/ttyDUMMY -DMBED_TARGET=ARM_MUSCA_S1
             cmake --build __build
diff --git a/.github/workflows/test_building_multiple_executables.yml b/.github/workflows/test_building_multiple_executables.yml
index b40a3a00ab..6e78369e2a 100644
--- a/.github/workflows/test_building_multiple_executables.yml
+++ b/.github/workflows/test_building_multiple_executables.yml
@@ -12,11 +12,10 @@ jobs:
 
       - name: Build the multiple_executables example
         run: |
-            mbedtools compile \
-              -t GCC_ARM \
-              -m ARM_MUSCA_S1 \
-              --program-path tools/cmake/tests/multiple_executables/ \
-              --mbed-os-path .
+            cd tools/cmake/tests/multiple_executables/
+            mkdir cmake_build
+            cd cmake_build
+            cmake -DMBED_TARGET=ARM_MUSCA_S1 ..
 
       - name: Verify the post-build command has run successfully on each image
         run: |