diff --git a/CMakeLists.txt b/CMakeLists.txt
index 500be132f88..0dcb70c22ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -140,7 +140,7 @@ function(mbed_set_mbed_target_linker_script target)
         target_link_options(mbed-core
             INTERFACE
                 "-T" "${CMAKE_BINARY_DIR}/${target}.link_script.ld"
-                "-Wl,-Map=${CMAKE_BINARY_DIR}/${target}.map"
+                "-Wl,-Map=${CMAKE_BINARY_DIR}/${target}${CMAKE_EXECUTABLE_SUFFIX}.map"
         )
     elseif(MBED_TOOLCHAIN STREQUAL "ARM")
         set(CMAKE_PRE_BUILD_COMMAND COMMAND "")
diff --git a/tools/cmake/app.cmake b/tools/cmake/app.cmake
index 3058b875df6..492252235eb 100644
--- a/tools/cmake/app.cmake
+++ b/tools/cmake/app.cmake
@@ -19,3 +19,7 @@ endif()
 include(${MBED_PATH}/tools/cmake/profile.cmake)
 
 enable_language(C CXX ASM)
+
+# set executable suffix (has to be done after enabling languages)
+# Note: This is nice to have, but is also required because STM32Cube will only work on files with a .elf extension
+set(CMAKE_EXECUTABLE_SUFFIX .elf)