diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/CMakeLists.txt
index 1cce4eae7f6..8a1b722aaf0 100644
--- a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_subdirectory(TARGET_STM32H745xI_CM4 EXCLUDE_FROM_ALL)
-add_subdirectory(TARGET_STM32H745xI_CM7 EXCLUDE_FROM_ALL)
-
 add_library(mbed-stm32h745xi INTERFACE)
 
 target_link_libraries(mbed-stm32h745xi INTERFACE mbed-stm32h7)
+
+add_subdirectory(TARGET_STM32H745xI_CM7 EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_STM32H745xI_CM4 EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_NUCLEO_H745ZI_Q EXCLUDE_FROM_ALL)
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_NUCLEO_H745ZI_Q/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_NUCLEO_H745ZI_Q/CMakeLists.txt
index 3e8bb191661..853f245c1dc 100644
--- a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_NUCLEO_H745ZI_Q/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_NUCLEO_H745ZI_Q/CMakeLists.txt
@@ -8,39 +8,12 @@ target_sources(mbed-nucleo-h745zi-q
         PeripheralPins.c
 )
 
-target_include_directories(mbed-nucleo-h745i
+target_include_directories(mbed-nucleo-h745zi-q
     INTERFACE
         .
 )
 
 target_link_libraries(mbed-nucleo-h745zi-q INTERFACE mbed-stm32h745xi-cm7)
 
-
-add_library(mbed-nucleo-h745i-cm7 INTERFACE)
-
-target_sources(mbed-nucleo-h745i-cm7
-    INTERFACE
-        PeripheralPins.c
-)
-
-target_include_directories(mbed-nucleo-h745zi-cm7
-    INTERFACE
-        .
-)
-
-target_link_libraries(mbed-nucleo-h745zi-cm7 INTERFACE mbed-stm32h745xi-cm7)
-
-
-add_library(mbed-nucleo-h745zi-cm4 INTERFACE)
-
-target_sources(mbed-nucleo-h745zi-cm4
-    INTERFACE
-        PeripheralPins.c
-)
-
-target_include_directories(mbed-nucleo-h745i-cm4
-    INTERFACE
-        .
-)
-
-target_link_libraries(mbed-nucleo-h745zi-cm4 INTERFACE mbed-stm32h745xi-cm4)
+add_library(mbed-nucleo-h745zi-q-cm7 ALIAS mbed-nucleo-h745zi-q)
+add_library(mbed-nucleo-h745zi-q-cm4 ALIAS mbed-nucleo-h745zi-q)
\ No newline at end of file