diff --git a/bsp/cmake/SetLinkerOptions.cmake b/bsp/cmake/SetLinkerOptions.cmake
index 2b9ee758..dcac8aab 100644
--- a/bsp/cmake/SetLinkerOptions.cmake
+++ b/bsp/cmake/SetLinkerOptions.cmake
@@ -32,6 +32,7 @@ macro(set_linker_script executable_target)
                 $<$<STREQUAL:${ARM_CORSTONE_BSP_TARGET_PLATFORM},corstone315>:--scatter=${IOT_REFERENCE_ARM_CORSTONE3XX_SOURCE_DIR}/bsp/corstone315/corstone_315_ns.sct>
                 $<$<STREQUAL:${ARM_CORSTONE_BSP_TARGET_PLATFORM},corstone320>:--scatter=${IOT_REFERENCE_ARM_CORSTONE3XX_SOURCE_DIR}/bsp/corstone320/corstone_320_ns.sct>
                 --map
+                --list=${executable_target}.map
                 --strict
         )
     endif()
diff --git a/release_changes/202504031422.change.md b/release_changes/202504031422.change.md
new file mode 100644
index 00000000..1711b584
--- /dev/null
+++ b/release_changes/202504031422.change.md
@@ -0,0 +1 @@
+armclang: Fix map file generation.