diff --git a/tasks/task5_1/Makefile b/tasks/task5_1/Makefile
index eb4010cdecf4b6483ac5f938578020b7df62c491..c64fc06b31dfbc72da0c72452dbb3d97f41f2934 100644
--- a/tasks/task5_1/Makefile
+++ b/tasks/task5_1/Makefile
@@ -20,6 +20,7 @@ FEATURES_REQUIRED += periph_timer
 FEATURES_REQUIRED += periph_gpio_irq
 USEMODULE += ztimer
 USEMODULE += ztimer_usec
+USEMODULE += ztimer_sec
 USEMODULE += periph_gpio
 
 CFLAGS += -DMAIN_HAS_NOARGC -w
diff --git a/tasks/task5_1/core_main.c b/tasks/task5_1/core_main.c
index 16635835d818c806afac41635a947406e4cdcad3..039f41292b359721d7c997e0c8a719de6280348d 100644
--- a/tasks/task5_1/core_main.c
+++ b/tasks/task5_1/core_main.c
@@ -21,6 +21,7 @@ Original Author: Shay Gal-on
    initial parameters, tun t he benchmark and report the results.
 */
 #include "coremark.h"
+#include "ztimer.h"
 
 /* Function: iterate
         Run the benchmark for a specified number of iterations.
@@ -390,5 +391,8 @@ for (i = 0; i < MULTITHREAD; i++) {
   /* And last call any target specific code for finalizing */
   portable_fini(&(results[0].port));
 
+  for (;;) {
+    ztimer_sleep(ZTIMER_SEC, 1);
+  }
   return MAIN_RETURN_VAL;
 }
diff --git a/tasks/task5_1/core_portme.h b/tasks/task5_1/core_portme.h
index 17fb33e8950f22e8e68f97ad430af93ce171447a..476646ec569157f6fa70bc174b3d12c8cc2c7b53 100644
--- a/tasks/task5_1/core_portme.h
+++ b/tasks/task5_1/core_portme.h
@@ -73,7 +73,7 @@ Original Author: Shay Gal-on
 #define COMPILER_FLAGS "-O2"
 #endif
 #ifndef MEM_LOCATION
-#define MEM_LOCATION "STACK"
+#define MEM_LOCATION "STATIC"
 #endif
 
 /* Data Types :
@@ -127,7 +127,7 @@ typedef ee_u32 CORE_TICKS;
         MEM_STACK - to allocate the data block on the stack (NYI).
 */
 #ifndef MEM_METHOD
-#define MEM_METHOD MEM_STACK
+#define MEM_METHOD MEM_STATIC
 #endif
 
 /* Configuration : MULTITHREAD