diff --git a/tests/drivers/nrfx_integration_test/Kconfig b/tests/drivers/nrfx_integration_test/Kconfig
index ce977a92737..b7dc66e9391 100644
--- a/tests/drivers/nrfx_integration_test/Kconfig
+++ b/tests/drivers/nrfx_integration_test/Kconfig
@@ -54,30 +54,6 @@ config NRFX_ALL_DRIVERS
 	select NRFX_SPI0	if HAS_HW_NRF_SPI0
 	select NRFX_SPI1	if HAS_HW_NRF_SPI1
 	select NRFX_SPI2	if HAS_HW_NRF_SPI2
-	select NRFX_SPIM0	if HAS_HW_NRF_SPIM0
-	select NRFX_SPIM1	if HAS_HW_NRF_SPIM1
-	select NRFX_SPIM2	if HAS_HW_NRF_SPIM2
-	select NRFX_SPIM3	if HAS_HW_NRF_SPIM3
-	select NRFX_SPIM4	if HAS_HW_NRF_SPIM4
-	select NRFX_SPIM00	if HAS_HW_NRF_SPIM00
-	select NRFX_SPIM20	if HAS_HW_NRF_SPIM20
-	select NRFX_SPIM21	if HAS_HW_NRF_SPIM21
-	select NRFX_SPIM22	if HAS_HW_NRF_SPIM22
-	select NRFX_SPIM30	if HAS_HW_NRF_SPIM30
-	select NRFX_SPIM120	if HAS_HW_NRF_SPIM120
-	select NRFX_SPIM121	if HAS_HW_NRF_SPIM121
-	select NRFX_SPIM130	if HAS_HW_NRF_SPIM130
-	select NRFX_SPIM131	if HAS_HW_NRF_SPIM131
-	select NRFX_SPIM132	if HAS_HW_NRF_SPIM132
-	select NRFX_SPIM133	if HAS_HW_NRF_SPIM133
-	select NRFX_SPIM134	if HAS_HW_NRF_SPIM134
-	select NRFX_SPIM135	if HAS_HW_NRF_SPIM135
-	select NRFX_SPIM136	if HAS_HW_NRF_SPIM136
-	select NRFX_SPIM137	if HAS_HW_NRF_SPIM137
-	select NRFX_SPIS0	if HAS_HW_NRF_SPIS0
-	select NRFX_SPIS1	if HAS_HW_NRF_SPIS1
-	select NRFX_SPIS2	if HAS_HW_NRF_SPIS2
-	select NRFX_SPIS3	if HAS_HW_NRF_SPIS3
 	select NRFX_SYSTICK	if CPU_CORTEX_M_HAS_SYSTICK
 	select NRFX_TEMP	if HAS_HW_NRF_TEMP
 	select NRFX_TIMER0	if HAS_HW_NRF_TIMER0
diff --git a/west.yml b/west.yml
index 80c46100bc5..ad5a94de56a 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: 079d80388a6240f572442ce7021f1aab31a56139
+      revision: 12fab80dedd836a27213c869d92b7f9cbc5f17f7
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above
@@ -280,7 +280,7 @@ manifest:
       path: nrfx
       groups:
         - nrfx
-      revision: 7ed74ac12ab94f561af820da8fb7089a0323e6de
+      revision: 171ae3df01f44d4548301fbd37f20f049ae23c46
 
   # West-related configuration for the nrf repository.
   self: