diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/CMakeLists.txt b/targets/TARGET_Cypress/TARGET_PSOC6/CMakeLists.txt
index 191e9abe53..c0e9ec3677 100644
--- a/targets/TARGET_Cypress/TARGET_PSOC6/CMakeLists.txt
+++ b/targets/TARGET_Cypress/TARGET_PSOC6/CMakeLists.txt
@@ -6,8 +6,8 @@ if("SCL" IN_LIST MBED_TARGET_LABELS)
 endif()
 
 if("WHD" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(COMPONENT_WHD)
-    add_subdirectory(common/COMPONENT_WHD)
+    add_subdirectory(COMPONENT_WHD EXCLUDE_FROM_ALL)
+    add_subdirectory(common/COMPONENT_WHD EXCLUDE_FROM_ALL)
 endif()
 
 if("CY8CKIT064B0S2_4343W" IN_LIST MBED_TARGET_LABELS)
@@ -32,18 +32,7 @@ elseif("CYW9P62S1_43438EVB_01" IN_LIST MBED_TARGET_LABELS)
     add_subdirectory(TARGET_CYW9P62S1_43438EVB_01)
 endif()
 
-add_subdirectory(psoc6csp/abstraction/rtos)
-if("RTX" IN_LIST MBED_TARGET_LABELS)
-    target_include_directories(mbed-core
-        INTERFACE
-        psoc6csp/abstraction/rtos/include/COMPONENT_RTX
-    )
-    target_sources(mbed-core
-        INTERFACE
-        psoc6csp/abstraction/rtos/source/COMPONENT_RTX/cyabs_rtos_rtxv5.c
-    )
-endif()
-
+add_subdirectory(psoc6csp/abstraction/rtos EXCLUDE_FROM_ALL)
 
 if("CM0P_BLESS" IN_LIST MBED_TARGET_LABELS)
     target_sources(mbed-core
@@ -118,7 +107,6 @@ target_include_directories(mbed-core
         common
         common/udb-sdio-whd
         psoc6csp/abstraction/resource/include
-        psoc6csp/abstraction/rtos/include
         psoc6csp/core_lib/include
         psoc6csp/hal/include
         psoc6csp/hal/include/pin_packages
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/CMakeLists.txt b/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/CMakeLists.txt
index f24961db5f..644cc35fc8 100644
--- a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/CMakeLists.txt
+++ b/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/CMakeLists.txt
@@ -107,7 +107,7 @@ target_sources(mbed-cy_psoc6_whd
         ${CLM_BLOB_C}
 )
 
-target_compile_definitions(mbed-core
+target_compile_definitions(mbed-cy_psoc6_whd
     INTERFACE
         MBED_CONF_CY_PSOC6_WHD_PRESENT=1
 )
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/psoc6csp/abstraction/rtos/CMakeLists.txt b/targets/TARGET_Cypress/TARGET_PSOC6/psoc6csp/abstraction/rtos/CMakeLists.txt
index 90bd3f8912..2b5c1479a2 100644
--- a/targets/TARGET_Cypress/TARGET_PSOC6/psoc6csp/abstraction/rtos/CMakeLists.txt
+++ b/targets/TARGET_Cypress/TARGET_PSOC6/psoc6csp/abstraction/rtos/CMakeLists.txt
@@ -3,6 +3,17 @@
 
 add_library(mbed-cy_psoc6csp_rtos INTERFACE)
 
+if("RTX" IN_LIST MBED_TARGET_LABELS)
+    target_include_directories(mbed-cy_psoc6csp_rtos
+        INTERFACE
+            include/COMPONENT_RTX
+    )
+    target_sources(mbed-cy_psoc6csp_rtos
+        INTERFACE
+            source/COMPONENT_RTX/cyabs_rtos_rtxv5.c
+    )
+endif()
+
 target_include_directories(mbed-cy_psoc6csp_rtos
     INTERFACE
         include
@@ -12,8 +23,3 @@ target_sources(mbed-cy_psoc6csp_rtos
     INTERFACE
         source/cy_worker_thread.c
 )
-
-target_compile_definitions(mbed-core
-    INTERFACE
-        MBED_CONF_CY_PSOC6CSP_RTOS_PRESENT=1
-)
diff --git a/targets/targets.json b/targets/targets.json
index c3752fd45c..691f5e354f 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -6488,7 +6488,10 @@
             "CY_USING_HAL",
             "MBED_TICKLESS"
         ],
-        "public": false
+        "public": false,
+        "supported_application_profiles": [
+            "full", "bare-metal"
+        ]
     },
     "CY8CPROTO_062_4343W": {
         "inherits": [