diff --git a/rimage b/rimage
index 01af253b5965..a0b0187ce1e9 160000
--- a/rimage
+++ b/rimage
@@ -1 +1 @@
-Subproject commit 01af253b59655c7823d40cc1e393859c628055ea
+Subproject commit a0b0187ce1e945869fd5343097282411b7118654
diff --git a/src/audio/host-zephyr.c b/src/audio/host-zephyr.c
index c496e5b29edb..119d2e353eba 100644
--- a/src/audio/host-zephyr.c
+++ b/src/audio/host-zephyr.c
@@ -457,10 +457,10 @@ static int host_copy_normal(struct host_data *hd, struct comp_dev *dev, copy_cal
 	copy_bytes = host_get_copy_bytes_normal(hd, dev);
 	if (!copy_bytes)
 		return 0;
-
+#if !CONFIG_DMA_INTEL_ADSP_HDA_TIMING_L1_EXIT
 	/* Register Host DMA usage */
 	pm_runtime_get(PM_RUNTIME_HOST_DMA_L1, 0);
-
+#endif
 	cb(dev, copy_bytes);
 
 	hd->partial_size += copy_bytes;
@@ -564,10 +564,12 @@ int host_zephyr_trigger(struct host_data *hd, struct comp_dev *dev, int cmd)
 		if (ret < 0)
 			comp_err(dev, "host_trigger(): dma_start() failed, ret = %u",
 				 ret);
+#if !CONFIG_DMA_INTEL_ADSP_HDA_TIMING_L1_EXIT
 		/* Register common L1 exit for all channels */
 		ret = notifier_register(NULL, scheduler_get_data(SOF_SCHEDULE_LL_TIMER),
 								NOTIFIER_ID_LL_POST_RUN, hda_dma_l1_exit_notify,
 								NOTIFIER_FLAG_AGGREGATE);
+#endif
 		break;
 	case COMP_TRIGGER_STOP:
 	case COMP_TRIGGER_XRUN:
@@ -576,9 +578,11 @@ int host_zephyr_trigger(struct host_data *hd, struct comp_dev *dev, int cmd)
 			if (ret < 0)
 				comp_err(dev, "host_trigger(): dma stop failed: %d",
 					 ret);
+#if !CONFIG_DMA_INTEL_ADSP_HDA_TIMING_L1_EXIT
 			/* Unregister L1 exit */
 			notifier_unregister(NULL, scheduler_get_data(SOF_SCHEDULE_LL_TIMER),
 								NOTIFIER_ID_LL_POST_RUN);
+#endif
 		}
 
 		break;
diff --git a/west.yml b/west.yml
index d9f88197de63..4e2bc7a5bc34 100644
--- a/west.yml
+++ b/west.yml
@@ -34,7 +34,7 @@ manifest:
     - name: rimage
       repo-path: rimage
       path: sof/rimage
-      revision: 01af253b59655c7823d40cc1e393859c628055ea
+      revision: a0b0187ce1e945869fd5343097282411b7118654
 
     - name: tomlc99
       repo-path: tomlc99
@@ -43,7 +43,7 @@ manifest:
 
     - name: zephyr
       repo-path: zephyr
-      revision: 79b598daf229fe971a303389d5301ab31212deb8
+      revision: c31e683295ebd77789f6b4e95c68b073b53b0112
       remote: thesofproject
 
       # Import some projects listed in zephyr/west.yml@revision