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 ce50789..4f7fd7f 100644
--- a/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_2/CMakeLists.txt
+++ b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_2/CMakeLists.txt
@@ -1,9 +1,15 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(mbed-bluenrg-2 STATIC EXCLUDE_FROM_ALL
-	BlueNrg2HCIDriver.cpp)
+add_library(mbed-bluenrg2 STATIC EXCLUDE_FROM_ALL
+    BlueNrg2HCIDriver.cpp)
 
-target_link_libraries(mbed-bluenrg-2 PUBLIC
-	mbed-os
-	mbed-ble)
+target_link_libraries(mbed-bluenrg2 
+    PUBLIC
+        mbed-core-flags
+        mbed-ble
+    PRIVATE
+        mbed-rtos-flags)
+
+# circular dependency between mbed-ble and the BlueNRG driver, because of the ble_cordio_get_hci_driver() implementation
+target_link_libraries(mbed-ble PUBLIC mbed-bluenrg2)
\ 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 2cc9fea..1ae932b 100644
--- a/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_MS/CMakeLists.txt
+++ b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_MS/CMakeLists.txt
@@ -4,6 +4,13 @@
 add_library(mbed-bluenrg-ms STATIC EXCLUDE_FROM_ALL
 	BlueNrgMsHCIDriver.cpp)
 
-target_link_libraries(mbed-bluenrg-ms PUBLIC
-	mbed-os
-	mbed-ble)
\ No newline at end of file
+target_link_libraries(mbed-bluenrg-ms
+    PUBLIC
+        mbed-core-flags
+        mbed-ble
+    PRIVATE
+        mbed-rtos-flags)
+
+
+# circular dependency between mbed-ble and the BlueNRG driver, because of the ble_cordio_get_hci_driver() implementation
+target_link_libraries(mbed-ble PUBLIC mbed-bluenrg-ms)
\ No newline at end of file