diff --git a/samples/benchmarks/coremark/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/benchmarks/coremark/boards/nrf54h20dk_nrf54h20_cpuapp.conf
index c999f4db93db..bf1805fafad2 100644
--- a/samples/benchmarks/coremark/boards/nrf54h20dk_nrf54h20_cpuapp.conf
+++ b/samples/benchmarks/coremark/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -11,5 +11,6 @@ CONFIG_LOG_FRONTEND=y
 CONFIG_LOG_FRONTEND_ONLY=y
 CONFIG_LOG_FRONTEND_STMESP=y
 CONFIG_LOG_FRONTEND_STMESP_FSC=y
+CONFIG_DEBUG_DRIVER=y
 
 CONFIG_UART_ASYNC_API=y
diff --git a/samples/benchmarks/coremark/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/benchmarks/coremark/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
index 15d9febc1386..bfaad516350c 100644
--- a/samples/benchmarks/coremark/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ b/samples/benchmarks/coremark/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -45,10 +45,7 @@
 	status = "okay";
 };
 
-&tddconf {
+&coresight {
 	status = "okay";
-	etrsources = <(NRF_TDDCONF_SOURCE_STMMAINCORE | NRF_TDDCONF_SOURCE_STMPPR |
-		       NRF_TDDCONF_SOURCE_STMFLPR)>;
-	portconfig = <0>;
-	etrbuffer = <&etr_buffer>;
+	mode = "stm-etr";
 };
diff --git a/samples/benchmarks/coremark/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/samples/benchmarks/coremark/boards/nrf54h20dk_nrf54h20_cpurad.overlay
index cf78cac0cb0e..4b5e49657c10 100644
--- a/samples/benchmarks/coremark/boards/nrf54h20dk_nrf54h20_cpurad.overlay
+++ b/samples/benchmarks/coremark/boards/nrf54h20dk_nrf54h20_cpurad.overlay
@@ -48,9 +48,3 @@
 &uart135 {
 	status = "disabled";
 };
-
-/* DTS nodes required for the STM standalone logging, imported from the nordic-log-stm snippet. */
-&tddconf {
-	status = "okay";
-	etrsources = <(NRF_TDDCONF_SOURCE_STMMAINCORE)>;
-};
diff --git a/samples/benchmarks/coremark/src/main.c b/samples/benchmarks/coremark/src/main.c
index f75374b45271..5343445aad54 100644
--- a/samples/benchmarks/coremark/src/main.c
+++ b/samples/benchmarks/coremark/src/main.c
@@ -8,7 +8,7 @@
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/drivers/gpio.h>
-#include <zephyr/drivers/misc/coresight/nrf_etr.h>
+#include <zephyr/drivers/debug/debug_nrf_etr.h>
 #include <system_nrf.h>
 
 #include "coremark_zephyr.h"
@@ -55,7 +55,7 @@ static atomic_t coremark_in_progress;
 
 static void logging_mode_multi_domain_blocked_state_indicate(void)
 {
-	if (!IS_ENABLED(CONFIG_NRF_ETR)) {
+	if (!IS_ENABLED(CONFIG_DEBUG_NRF_ETR)) {
 		return;
 	}
 
@@ -70,7 +70,7 @@ static void logging_mode_multi_domain_blocked_state_indicate(void)
 	k_sleep(K_MSEC(100));
 
 	/* Flush logs from the ETR and direct them to UART. */
-	nrf_etr_flush();
+	debug_nrf_etr_flush();
 }
 
 static int logging_mode_indicate(void)
@@ -94,7 +94,7 @@ static int logging_mode_indicate(void)
 		/* Only the core responsible for moving the logs from the STM sink to UART
 		 * indicates the logging mode.
 		 */
-		if (IS_ENABLED(CONFIG_NRF_ETR)) {
+		if (IS_ENABLED(CONFIG_DEBUG_NRF_ETR)) {
 			LOG_INF("Multi-domain logging mode");
 			LOG_INF("This core is used to output logs from all cores to terminal "
 				"over UART\n");
diff --git a/scripts/quarantine.yaml b/scripts/quarantine.yaml
index 90a255178759..05fd6d467e9a 100644
--- a/scripts/quarantine.yaml
+++ b/scripts/quarantine.yaml
@@ -75,13 +75,6 @@
     - nrf54h20dk@0.9.0/nrf54h20/cpuapp
   comment: "https://nordicsemi.atlassian.net/browse/NCSDK-34187"
 
-- scenarios:
-    - sample.benchmark.coremark.heap_memory
-    - sample.benchmark.coremark.multiple_threads
-  platforms:
-    - nrf54h20dk@0.9.0/nrf54h20/cpuapp
-  comment: "https://nordicsemi.atlassian.net/browse/NCSDK-31463"
-
 - scenarios:
     - sample.nrf7002_eb.thingy53.shell
   platforms:
diff --git a/west.yml b/west.yml
index 6cc77e23033e..29125d34793c 100644
--- a/west.yml
+++ b/west.yml
@@ -65,7 +65,7 @@ manifest:
     # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
     - name: zephyr
       repo-path: sdk-zephyr
-      revision: 1801e0bf52f9ba75868e09ef154c13047f606832
+      revision: 34f1aa346560cdbb528caea4d52188ebdeb81c4f
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above