diff --git a/CMakeLists.txt b/CMakeLists.txt
index 38c7f272..e8c640ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -668,7 +668,11 @@ if(ARCH STREQUAL "ARM")
     endif()
     if(${WOLFBOOT_TARGET} STREQUAL "stm32u5")
         set(ARCH_FLASH_OFFSET 0x08000000)
-        set(WOLFBOOT_ORIGIN ${ARCH_FLASH_OFFSET})
+        if(TZEN)
+            set(WOLFBOOT_ORIGIN 0x0C000000)
+        else()
+            set(WOLFBOOT_ORIGIN ${ARCH_FLASH_OFFSET})
+        endif()
     endif()
 
     if(${WOLFBOOT_TARGET} STREQUAL "stm32h5")
diff --git a/test-app/CMakeLists.txt b/test-app/CMakeLists.txt
index 5275d7c6..a2410436 100644
--- a/test-app/CMakeLists.txt
+++ b/test-app/CMakeLists.txt
@@ -52,7 +52,11 @@ endif()
 if("${WOLFBOOT_TARGET}" STREQUAL "stm32h7")
     set(APP_LSCRIPT_TEMPLATE ${CMAKE_CURRENT_SOURCE_DIR}/ARM-stm32h7.ld)
 elseif("${WOLFBOOT_TARGET}" STREQUAL "stm32u5")
-    set(APP_LSCRIPT_TEMPLATE ${CMAKE_CURRENT_SOURCE_DIR}/ARM-stm32u5.ld)
+    if(TZEN)
+        set(APP_LSCRIPT_TEMPLATE ${CMAKE_CURRENT_SOURCE_DIR}/ARM-stm32u5-ns.ld)
+    else()
+        set(APP_LSCRIPT_TEMPLATE ${CMAKE_CURRENT_SOURCE_DIR}/ARM-stm32u5.ld)
+    endif()
 elseif("${WOLFBOOT_TARGET}" STREQUAL "stm32h5")
     if(TZEN)
         set(APP_LSCRIPT_TEMPLATE ${CMAKE_CURRENT_SOURCE_DIR}/ARM-stm32h5-ns.ld)