diff --git a/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_2/CMakeLists.txt b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_2/CMakeLists.txt
index 8b4980f..ce50789 100644
--- a/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_2/CMakeLists.txt
+++ b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_2/CMakeLists.txt
@@ -1,8 +1,9 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-target_sources(mbed-ble
-    PRIVATE
-        BlueNrg2HCIDriver.cpp
-)
+add_library(mbed-bluenrg-2 STATIC EXCLUDE_FROM_ALL
+	BlueNrg2HCIDriver.cpp)
 
+target_link_libraries(mbed-bluenrg-2 PUBLIC
+	mbed-os
+	mbed-ble)
diff --git a/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_2/README.md b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_2/README.md
index 2cd955d..76154b3 100644
--- a/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_2/README.md
+++ b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_2/README.md
@@ -155,6 +155,8 @@
         }
 ```
 
+Then, you must link the `mbed-bluenrg-2` CMake target to your application.  Note that the BlueNRG 2 driver requires Mbed RTOS and does not work with mbed-baremetal.
+
 ### Known limitations
 
 Security does not work with privacy due to pairing failure.
\ No newline at end of file
diff --git a/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_MS/CMakeLists.txt b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_MS/CMakeLists.txt
index cd1a23e..2cc9fea 100644
--- a/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_MS/CMakeLists.txt
+++ b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_MS/CMakeLists.txt
@@ -1,12 +1,9 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-target_include_directories(mbed-ble
-    PUBLIC
-        .
-)
+add_library(mbed-bluenrg-ms STATIC EXCLUDE_FROM_ALL
+	BlueNrgMsHCIDriver.cpp)
 
-target_sources(mbed-ble
-    PRIVATE
-        BlueNrgMsHCIDriver.cpp
-)
+target_link_libraries(mbed-bluenrg-ms PUBLIC
+	mbed-os
+	mbed-ble)
\ No newline at end of file
diff --git a/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_MS/README.md b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_MS/README.md
index abfe319..639f61b 100644
--- a/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_MS/README.md
+++ b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_MS/README.md
@@ -122,3 +122,5 @@
             "target.extra_labels_add": ["CORDIO"]
         }
 ```
+
+Then, you must link the `mbed-bluenrg-ms` CMake target to your application.  Note that the BlueNRG 2 driver requires Mbed RTOS and does not work with mbed-baremetal.
diff --git a/connectivity/drivers/mbedtls/TARGET_STM/CMakeLists.txt b/connectivity/drivers/mbedtls/TARGET_STM/CMakeLists.txt
index 66b58e6..39bb946 100644
--- a/connectivity/drivers/mbedtls/TARGET_STM/CMakeLists.txt
+++ b/connectivity/drivers/mbedtls/TARGET_STM/CMakeLists.txt
@@ -13,8 +13,8 @@
     add_subdirectory(TARGET_STM32L486xG)
 elseif("STM32L4S5xI" IN_LIST MBED_TARGET_LABELS)
     add_subdirectory(TARGET_STM32L4S5xI)
-elseif("STM32L562xx" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_STM32L562xx)
+elseif("STM32L562xE" IN_LIST MBED_TARGET_LABELS)
+    add_subdirectory(TARGET_STM32L562xE)
 elseif("STM32WB" IN_LIST MBED_TARGET_LABELS)
     add_subdirectory(TARGET_STM32WB)
 endif()
diff --git a/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L562xE/CMakeLists.txt b/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L562xE/CMakeLists.txt
new file mode 100644
index 0000000..00a3c76
--- /dev/null
+++ b/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L562xE/CMakeLists.txt
@@ -0,0 +1,7 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+target_include_directories(mbed-mbedtls
+    PUBLIC
+        .
+)
diff --git a/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L562xx/CMakeLists.txt b/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L562xx/CMakeLists.txt
deleted file mode 100644
index 00a3c76..0000000
--- a/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L562xx/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-target_include_directories(mbed-mbedtls
-    PUBLIC
-        .
-)