diff --git a/model/fvp_common.sh b/model/fvp_common.sh
index cc1afe6..e52ed28 100644
--- a/model/fvp_common.sh
+++ b/model/fvp_common.sh
@@ -43,7 +43,7 @@
 -C bp.ve_sysregs.exit_on_shutdown=1
 -C pctl.startup=$pctl_startup
 
-${wait_debugger+-S}
+${wait_debugger+-I -p}
 
 ${secure_memory+-C bp.secure_memory=$secure_memory}
 ${cache_state_modelled+-C cache_state_modelled=$cache_state_modelled}