diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/CMakeLists.txt
index 6774c98b33..48a0833773 100644
--- a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/CMakeLists.txt
@@ -1,10 +1,10 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+add_subdirectory(TARGET_STM32H747xI_CM4 EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_STM32H747xI_CM7 EXCLUDE_FROM_ALL)
 add_subdirectory(TARGET_DISCO_H747I EXCLUDE_FROM_ALL)
 add_subdirectory(TARGET_PORTENTA_H7 EXCLUDE_FROM_ALL)
-add_subdirectory(TARGET_STM32H747xI_CM7 EXCLUDE_FROM_ALL)
-add_subdirectory(TARGET_STM32H747xI_CM4 EXCLUDE_FROM_ALL)
 
 add_library(mbed-stm32h747xi INTERFACE)
 
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I/CMakeLists.txt
index 2a398afa43..6631f16d24 100644
--- a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I/CMakeLists.txt
@@ -13,10 +13,34 @@ target_include_directories(mbed-disco-h747i
         .
 )
 
-target_link_libraries(mbed-disco-h747i INTERFACE mbed-stm32h747xi mbed-stm32h747xi-cm7)
+target_link_libraries(mbed-disco-h747i INTERFACE mbed-stm32h747xi-cm7)
+
 
 add_library(mbed-disco-h747i-cm7 INTERFACE)
-target_link_libraries(mbed-disco-h747i-cm7 INTERFACE mbed-stm32h747xi mbed-stm32h747xi-cm7)
+
+target_sources(mbed-disco-h747i-cm7
+    INTERFACE
+        PeripheralPins.c
+)
+
+target_include_directories(mbed-disco-h747i-cm7
+    INTERFACE
+        .
+)
+
+target_link_libraries(mbed-disco-h747i-cm7 INTERFACE mbed-stm32h747xi-cm7)
+
 
 add_library(mbed-disco-h747i-cm4 INTERFACE)
-target_link_libraries(mbed-disco-h747i-cm4 INTERFACE mbed-stm32h747xi mbed-stm32h747xi-cm4)
+
+target_sources(mbed-disco-h747i-cm4
+    INTERFACE
+        PeripheralPins.c
+)
+
+target_include_directories(mbed-disco-h747i-cm4
+    INTERFACE
+        .
+)
+
+target_link_libraries(mbed-disco-h747i-cm4 INTERFACE mbed-stm32h747xi-cm4)