diff --git a/.github/workflows/greentea_cmake.yml b/.github/workflows/greentea_cmake.yml
index b38416226c5..16601e5ced5 100644
--- a/.github/workflows/greentea_cmake.yml
+++ b/.github/workflows/greentea_cmake.yml
@@ -1,8 +1,8 @@
-name: Test that Mbed and Greentea tests compile for each MCU family.
+name: Compile Check
 on: [pull_request]
 
 jobs:
-  build-greentea-cmake:
+  build-greentea-with-cmake:
     runs-on: ubuntu-latest
     container: ghcr.io/armmbed/mbed-os-env:master-latest
 
@@ -19,118 +19,118 @@ jobs:
           # NXP MCUs
           - target: LPC1768
             baremetal: 0
-          # - target: LPC546XX
-          #   baremetal: 0
-          # - target: MIMXRT1060_EVK
-          #   baremetal: 0
-          # - target: MIMXRT1170_EVK
-          #   baremetal: 0
+          - target: LPC546XX
+            baremetal: 0
+          - target: MIMXRT1060_EVK
+            baremetal: 0
+          - target: MIMXRT1170_EVK
+            baremetal: 0
 
-          # # Freescale MCUs
+          # Freescale MCUs
           - target: K64F
             baremetal: 0
-          # - target: KL43Z
-          #   baremetal: 0
-          # - target: KW41Z
-          #   baremetal: 0
-
-          # # STM32 MCUs
-          # - target: NUCLEO_F091RC
-          #   baremetal: 0
-          # - target: NUCLEO_F103RB
-          #   baremetal: 1
-          # - target: NUCLEO_F207ZG
-          #   baremetal: 0
-          # - target: NUCLEO_F303RE
-          #   baremetal: 0
-          # - target: NUCLEO_F429ZI
-          #   baremetal: 0
-          # - target: NUCLEO_F767ZI
-          #   baremetal: 0
-          # - target: NUCLEO_G031K8
-          #   baremetal: 1
-          # - target: NUCLEO_G431RB
-          #   baremetal: 0
-          # - target: NUCLEO_H563ZI
-          #   baremetal: 0
-          # - target: NUCLEO_H745ZI_Q_CM7
-          #   baremetal: 0
-          # - target: DISCO_L072CZ_LRWAN1
-          #   baremetal: 1
-          # - target: XDOT_L151CC
-          #   baremetal: 0
-          # - target: DISCO_L4R9I
-          #   baremetal: 0
-          # - target: DISCO_L562QE
-          #   baremetal: 0
-          # - target: B_U585I_IOT02A
-          #   baremetal: 0
-          # - target: NUCLEO_WB55RG
-          #   baremetal: 0
-          # - target: NUCLEO_WL55JC
-          #   baremetal: 0
-
-          # # Maxim MCUs
+          - target: KL43Z
+            baremetal: 0
+          - target: KW41Z
+            baremetal: 0
+
+          # STM32 MCUs
+          - target: NUCLEO_F091RC
+            baremetal: 0
+          - target: NUCLEO_F103RB
+            baremetal: 1
+          - target: NUCLEO_F207ZG
+            baremetal: 0
+          - target: NUCLEO_F303RE
+            baremetal: 0
+          - target: NUCLEO_F429ZI
+            baremetal: 0
+          - target: NUCLEO_F767ZI
+            baremetal: 0
+          - target: NUCLEO_G031K8
+            baremetal: 1
+          - target: NUCLEO_G431RB
+            baremetal: 0
+          - target: NUCLEO_H563ZI
+            baremetal: 0
+          - target: NUCLEO_H745ZI_Q_CM7
+            baremetal: 0
+          - target: DISCO_L072CZ_LRWAN1
+            baremetal: 1
+          - target: XDOT_L151CC
+            baremetal: 0
+          - target: DISCO_L4R9I
+            baremetal: 0
+          - target: DISCO_L562QE
+            baremetal: 0
+          - target: B_U585I_IOT02A
+            baremetal: 0
+          - target: NUCLEO_WB55RG
+            baremetal: 0
+          - target: NUCLEO_WL55JC
+            baremetal: 0
+
+          # Maxim MCUs
           - target: MAX32625MBED
             baremetal: 0
-          # - target: XDOT_MAX32670
-          #   baremetal: 0
-
-          # # Nuvoton MCUs
-          # - target: NUMAKER_PFM_NANO130
-          #   baremetal: 1
-          # - target: NUMAKER_PFM_M487
-          #   baremetal: 0
-          # - target: NU_M2354
-          #   baremetal: 0
-
-          # # Samsung MCUs
-          # - target: S1SBP6A
-          #   baremetal: 0
-
-          # # nRF MCUs
-          # - target: NRF52840_DK
-          #   baremetal: 0
-          # - target: ARDUINO_NICLA_SENSE_ME
-          #   baremetal: 0
-
-          # # Toshiba MCUs
-          # - target: TMPM4NR
-          #   baremetal: 0
-
-          # # Renesas MCUs
-          # - target: GR_MANGO
-          #   baremetal: 0
-          # - target: RZ_A1H
-          #   baremetal: 0
-
-          # # Ambiq MCUs
-          # - target: SFE_ARTEMIS_DK
-          #   baremetal: 0
-
-          # # Infineon/Cypress MCUs
-          # - target: CY8CKIT_062S2_43012
-          #   baremetal: 0
-          # - target: CYTFM_064B0S2_4343W
-          #   baremetal: 0
-
-          # # Analog Devices MCUs
-          # - target: EV_COG_AD4050LZ
-          #   baremetal: 0
-
-          # # GigaDevices MCUs
-          # - target: GD32_F307VG
-          #   baremetal: 0
-          # - target: GD32_F450ZI
-          #   baremetal: 0
-
-          # # SiLabs MCUs
-          # - target: EFM32GG11_STK3701
-          #   baremetal: 0
-
-          # # Raspberry Pi MCUs
-          # - target: RASPBERRY_PI_PICO
-          #   baremetal: 0
+          - target: XDOT_MAX32670
+            baremetal: 0
+
+          # Nuvoton MCUs
+          - target: NUMAKER_PFM_NANO130
+            baremetal: 1
+          - target: NUMAKER_PFM_M487
+            baremetal: 0
+          - target: NU_M2354
+            baremetal: 0
+
+          # Samsung MCUs
+          - target: S1SBP6A
+            baremetal: 0
+
+          # nRF MCUs
+          - target: NRF52840_DK
+            baremetal: 0
+          - target: ARDUINO_NICLA_SENSE_ME
+            baremetal: 0
+
+          # Toshiba MCUs
+          - target: TMPM4NR
+            baremetal: 0
+
+          # Renesas MCUs
+          - target: GR_MANGO
+            baremetal: 0
+          - target: RZ_A1H
+            baremetal: 0
+
+          # Ambiq MCUs
+          - target: SFE_ARTEMIS_DK
+            baremetal: 0
+
+          # Infineon/Cypress MCUs
+          - target: CY8CKIT_062S2_43012
+            baremetal: 0
+          - target: CYTFM_064B0S2_4343W
+            baremetal: 0
+
+          # Analog Devices MCUs
+          - target: EV_COG_AD4050LZ
+            baremetal: 0
+
+          # GigaDevices MCUs
+          - target: GD32_F307VG
+            baremetal: 0
+          - target: GD32_F450ZI
+            baremetal: 0
+
+          # SiLabs MCUs
+          - target: EFM32GG11_STK3701
+            baremetal: 0
+
+          # Raspberry Pi MCUs
+          - target: RASPBERRY_PI_PICO
+            baremetal: 0
 
     steps:
       - name: Checkout