diff --git a/boot/zephyr/main.c b/boot/zephyr/main.c
index 517ec60..9dbac7c 100644
--- a/boot/zephyr/main.c
+++ b/boot/zephyr/main.c
@@ -44,6 +44,10 @@
 #include <usb/class/usb_dfu.h>
 #endif
 
+#if CONFIG_MCUBOOT_CLEANUP_ARM_CORE
+#include <arm_cleanup.h>
+#endif
+
 #if defined(CONFIG_LOG) && !defined(CONFIG_LOG_IMMEDIATE)
 #ifdef CONFIG_LOG_PROCESS_THREAD
 #warning "The log internal thread for log processing can't transfer the log"\
@@ -126,7 +130,13 @@
     /* Disable the USB to prevent it from firing interrupts */
     usb_disable();
 #endif
+#if CONFIG_MCUBOOT_CLEANUP_ARM_CORE
+    cleanup_arm_nvic(); /* cleanup NVIC registers */
+#endif
     __set_MSP(vt->msp);
+#if CONFIG_MCUBOOT_CLEANUP_ARM_CORE
+    __set_CONTROL(0x00); /* application will configures core on its own */
+#endif
     ((void (*)(void))vt->reset)();
 }