diff --git a/subsys/nrf_security/tfm/CMakeLists.txt b/subsys/nrf_security/tfm/CMakeLists.txt
index 468e817a1868..d9e25af950ee 100644
--- a/subsys/nrf_security/tfm/CMakeLists.txt
+++ b/subsys/nrf_security/tfm/CMakeLists.txt
@@ -34,6 +34,12 @@ endforeach()
 # Standard extensions of Zephyr included in the TF-M build
 list(APPEND CMAKE_MODULE_PATH ${ZEPHYR_BASE}/cmake/modules)
 include(extensions)
+
+# Force a re-run of TF-M configuration if zephyr configuration has changed.
+# Since we import these configurations we need to re-run when they have changed.
+set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${ZEPHYR_AUTOCONF})
+set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${ZEPHYR_DOTCONFIG})
+
 import_kconfig(CONFIG_ ${ZEPHYR_DOTCONFIG})
 
 # Additional TF-M build only settings: