diff --git a/applications/sdp/mspi/src/hrt/hrt.c b/applications/sdp/mspi/src/hrt/hrt.c
index 129f4fe409b1..e03b97fe7360 100644
--- a/applications/sdp/mspi/src/hrt/hrt.c
+++ b/applications/sdp/mspi/src/hrt/hrt.c
@@ -26,46 +26,6 @@
  */
 #define CNT1_TOP_CALCULATE(cnt0_top) (2 * ((cnt0_top) + 1) - 1)
 
-/** @brief Shift control configuration. */
-typedef struct {
-	uint8_t shift_count;
-	nrf_vpr_csr_vio_shift_t out_mode;
-	uint8_t frame_width;
-	nrf_vpr_csr_vio_mode_in_t in_mode;
-} nrf_vpr_csr_vio_shift_ctrl_t;
-
-NRF_STATIC_INLINE void
-nrf_vpr_csr_vio_shift_ctrl_buffered_set(nrf_vpr_csr_vio_shift_ctrl_t const *p_shift_ctrl)
-{
-	uint32_t reg =
-		((p_shift_ctrl->shift_count << VPRCSR_NORDIC_SHIFTCTRLB_SHIFTCNTB_VALUE_Pos) &
-		 VPRCSR_NORDIC_SHIFTCTRLB_SHIFTCNTB_VALUE_Msk) |
-		((p_shift_ctrl->out_mode << VPRCSR_NORDIC_SHIFTCTRLB_OUTMODEB_MODE_Pos) &
-		 VPRCSR_NORDIC_SHIFTCTRLB_OUTMODEB_MODE_Msk) |
-		((p_shift_ctrl->frame_width << VPRCSR_NORDIC_SHIFTCTRLB_OUTMODEB_FRAMEWIDTH_Pos) &
-		 VPRCSR_NORDIC_SHIFTCTRLB_OUTMODEB_FRAMEWIDTH_Msk) |
-		((p_shift_ctrl->in_mode << VPRCSR_NORDIC_SHIFTCTRLB_INMODEB_MODE_Pos) &
-		 VPRCSR_NORDIC_SHIFTCTRLB_INMODEB_MODE_Msk);
-
-	nrf_csr_write(VPRCSR_NORDIC_SHIFTCTRLB, reg);
-}
-
-/* Temporary function definition until the one from nrfx has its return type fixed. */
-NRF_STATIC_INLINE uint32_t vpr_csr_vio_in_buffered_reversed_byte_get(void)
-{
-	return nrf_csr_read(VPRCSR_NORDIC_INBRB);
-}
-
-NRF_STATIC_INLINE void nrf_vpr_csr_vio_out_or_set(uint16_t value)
-{
-	nrf_csr_set_bits(VPRCSR_NORDIC_OUT, value);
-}
-
-NRF_STATIC_INLINE void nrf_vpr_csr_vio_out_clear_set(uint16_t value)
-{
-	nrf_csr_clear_bits(VPRCSR_NORDIC_OUT, value);
-}
-
 static const nrf_vpr_csr_vio_shift_ctrl_t write_final_shift_ctrl_cfg = {
 	.shift_count = 1,
 	.out_mode = NRF_VPR_CSR_VIO_SHIFT_NONE,
@@ -356,7 +316,7 @@ void hrt_read(volatile hrt_xfer_t *hrt_xfer_params)
 
 	for (uint8_t i = 0; i < hrt_xfer_params->xfer_data[HRT_FE_DATA].word_count; i++) {
 		hrt_xfer_params->xfer_data[HRT_FE_DATA].data[i] =
-			vpr_csr_vio_in_buffered_reversed_byte_get() >> INPUT_SHIFT_COUNT;
+			nrf_vpr_csr_vio_in_buffered_reversed_byte_get() >> INPUT_SHIFT_COUNT;
 	}
 
 	/* Stop counters */
diff --git a/applications/sdp/mspi/src/main.c b/applications/sdp/mspi/src/main.c
index cac407ae7aae..ba33a841e4c0 100644
--- a/applications/sdp/mspi/src/main.c
+++ b/applications/sdp/mspi/src/main.c
@@ -77,16 +77,6 @@ static volatile uint8_t response_buffer[CONFIG_SDP_MSPI_MAX_RESPONSE_SIZE];
 static struct ipc_ept ep;
 static atomic_t ipc_atomic_sem = ATOMIC_INIT(0);
 
-NRF_STATIC_INLINE void nrf_vpr_csr_vio_out_or_set(uint16_t value)
-{
-	nrf_csr_set_bits(VPRCSR_NORDIC_OUT, value);
-}
-
-NRF_STATIC_INLINE void nrf_vpr_csr_vio_out_clear_set(uint16_t value)
-{
-	nrf_csr_clear_bits(VPRCSR_NORDIC_OUT, value);
-}
-
 static void adjust_tail(volatile hrt_xfer_data_t *xfer_data, uint16_t frame_width,
 			uint32_t data_length)
 {
diff --git a/samples/bluetooth/conn_time_sync/src/timed_led_toggle.c b/samples/bluetooth/conn_time_sync/src/timed_led_toggle.c
index 34e8779d537f..b6834bab6418 100644
--- a/samples/bluetooth/conn_time_sync/src/timed_led_toggle.c
+++ b/samples/bluetooth/conn_time_sync/src/timed_led_toggle.c
@@ -14,7 +14,6 @@
 #include <zephyr/device.h>
 #include <zephyr/drivers/gpio.h>
 #include <soc.h>
-#include <hal/nrf_rtc.h>
 #include <nrfx_gpiote.h>
 #include <helpers/nrfx_gppi.h>
 #include "conn_time_sync.h"
diff --git a/samples/bluetooth/iso_time_sync/src/timed_led_toggle.c b/samples/bluetooth/iso_time_sync/src/timed_led_toggle.c
index b5f7afcad89f..fafa39322476 100644
--- a/samples/bluetooth/iso_time_sync/src/timed_led_toggle.c
+++ b/samples/bluetooth/iso_time_sync/src/timed_led_toggle.c
@@ -14,7 +14,6 @@
 #include <zephyr/device.h>
 #include <zephyr/drivers/gpio.h>
 #include <soc.h>
-#include <hal/nrf_rtc.h>
 #include <nrfx_gpiote.h>
 #include <helpers/nrfx_gppi.h>
 #include "iso_time_sync.h"
diff --git a/west.yml b/west.yml
index a492179cdd65..15c08bac1efc 100644
--- a/west.yml
+++ b/west.yml
@@ -66,7 +66,7 @@ manifest:
     # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
     - name: zephyr
       repo-path: sdk-zephyr
-      revision: 107f9f0cf5369c707282724f7484d708a99ed274
+      revision: 16dc0c6c01401abcb069ec35139f490c2b13d907
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above
@@ -149,7 +149,7 @@ manifest:
     - name: trusted-firmware-m
       repo-path: sdk-trusted-firmware-m
       path: modules/tee/tf-m/trusted-firmware-m
-      revision: 3f08f2595d976624e42478bb377cb24798b00a5d
+      revision: 27524bca5c93d136e3316cc1bf437f32400d18cf
     - name: psa-arch-tests
       repo-path: sdk-psa-arch-tests
       path: modules/tee/tf-m/psa-arch-tests