diff --git a/ports/zephyr-cp/boards/adafruit_feather_nrf52840_uf2.conf b/ports/zephyr-cp/boards/adafruit_feather_nrf52840_uf2.conf
index c30c8c19fcddb..4849c8ce2b4ad 100644
--- a/ports/zephyr-cp/boards/adafruit_feather_nrf52840_uf2.conf
+++ b/ports/zephyr-cp/boards/adafruit_feather_nrf52840_uf2.conf
@@ -6,4 +6,3 @@ CONFIG_BT_OBSERVER=y
 CONFIG_BT_EXT_ADV=y
 
 CONFIG_BOARD_SERIAL_BACKEND_CDC_ACM=n
-CONFIG_BOARD_REQUIRES_SERIAL_BACKEND_CDC_ACM=n
diff --git a/ports/zephyr-cp/boards/board_aliases.cmake b/ports/zephyr-cp/boards/board_aliases.cmake
index ee46145a1127f..dce5b100aa6df 100644
--- a/ports/zephyr-cp/boards/board_aliases.cmake
+++ b/ports/zephyr-cp/boards/board_aliases.cmake
@@ -1,18 +1,46 @@
-set(pca10056_BOARD_ALIAS nrf52840dk/nrf52840)
-set(adafruit_feather_nrf52840_zephyr_BOARD_ALIAS adafruit_feather_nrf52840/nrf52840/uf2)
-set(renesas_ek_ra6m5_BOARD_ALIAS ek_ra6m5)
-set(renesas_ek_ra8d1_BOARD_ALIAS ek_ra8d1)
-set(renesas_da14695_dk_usb_BOARD_ALIAS da14695_dk_usb)
-set(native_native_sim_BOARD_ALIAS native_sim)
-set(native_nrf5340bsim_BOARD_ALIAS nrf5340bsim/nrf5340/cpuapp)
-set(nordic_nrf54l15dk_BOARD_ALIAS nrf54l15dk/nrf54l15/cpuapp)
-set(nordic_nrf54h20dk_BOARD_ALIAS nrf54h20dk/nrf54h20/cpuapp)
-set(nordic_nrf5340dk_BOARD_ALIAS nrf5340dk/nrf5340/cpuapp)
-set(nordic_nrf7002dk_BOARD_ALIAS nrf7002dk/nrf5340/cpuapp)
-set(nxp_frdm_mcxn947_BOARD_ALIAS frdm_mcxn947/mcxn947/cpu0)
-set(nxp_frdm_rw612_BOARD_ALIAS frdm_rw612)
-set(nxp_mimxrt1170_evk_BOARD_ALIAS mimxrt1170_evk@A/mimxrt1176/cm7)
-set(st_stm32h7b3i_dk_BOARD_ALIAS stm32h7b3i_dk)
-set(st_stm32wba65i_dk1_BOARD_ALIAS stm32wba65i_dk1)
-set(st_nucleo_u575zi_q_BOARD_ALIAS nucleo_u575zi_q/stm32u575xx)
-set(st_nucleo_n657x0_q_BOARD_ALIAS nucleo_n657x0_q/stm32n657xx)
+# Workaround for Zephyr alias handling with BOARD_QUALIFIERS in newer Zephyr.
+#
+# Instead of using <alias>_BOARD_ALIAS variables, translate BOARD directly so
+# we don't end up with a spurious trailing '/' in BOARD_QUALIFIERS.
+macro(cp_board_alias alias target)
+  if(BOARD STREQUAL "${alias}")
+    if(NOT "${target}" MATCHES "^([^@/]+)(@[^@/]+)?(/([^@]+))?$")
+      message(FATAL_ERROR "Invalid alias target '${target}'")
+    endif()
+
+    set(BOARD_ALIAS "${alias}" CACHE STRING "Board alias, provided by user")
+    set(BOARD "${CMAKE_MATCH_1}")
+
+    if(CMAKE_MATCH_2)
+      string(REPLACE "@" "" _rev "${CMAKE_MATCH_2}")
+      set(BOARD_REVISION "${_rev}")
+    else()
+      unset(BOARD_REVISION)
+    endif()
+
+    if(CMAKE_MATCH_4)
+      set(BOARD_QUALIFIERS "${CMAKE_MATCH_4}")
+    else()
+      unset(BOARD_QUALIFIERS)
+    endif()
+  endif()
+endmacro()
+
+cp_board_alias(pca10056 nrf52840dk/nrf52840)
+cp_board_alias(adafruit_feather_nrf52840_zephyr adafruit_feather_nrf52840/nrf52840/uf2)
+cp_board_alias(renesas_ek_ra6m5 ek_ra6m5)
+cp_board_alias(renesas_ek_ra8d1 ek_ra8d1)
+cp_board_alias(renesas_da14695_dk_usb da14695_dk_usb)
+cp_board_alias(native_native_sim native_sim/native)
+cp_board_alias(native_nrf5340bsim nrf5340bsim/nrf5340/cpuapp)
+cp_board_alias(nordic_nrf54l15dk nrf54l15dk/nrf54l15/cpuapp)
+cp_board_alias(nordic_nrf54h20dk nrf54h20dk/nrf54h20/cpuapp)
+cp_board_alias(nordic_nrf5340dk nrf5340dk/nrf5340/cpuapp)
+cp_board_alias(nordic_nrf7002dk nrf7002dk/nrf5340/cpuapp)
+cp_board_alias(nxp_frdm_mcxn947 frdm_mcxn947/mcxn947/cpu0)
+cp_board_alias(nxp_frdm_rw612 frdm_rw612)
+cp_board_alias(nxp_mimxrt1170_evk mimxrt1170_evk@A/mimxrt1176/cm7)
+cp_board_alias(st_stm32h7b3i_dk stm32h7b3i_dk)
+cp_board_alias(st_stm32wba65i_dk1 stm32wba65i_dk1)
+cp_board_alias(st_nucleo_u575zi_q nucleo_u575zi_q/stm32u575xx)
+cp_board_alias(st_nucleo_n657x0_q nucleo_n657x0_q/stm32n657xx)
diff --git a/ports/zephyr-cp/boards/frdm_rw612.conf b/ports/zephyr-cp/boards/frdm_rw612.conf
index 7d56dfed29cc9..4fc5c8c5bf0fe 100644
--- a/ports/zephyr-cp/boards/frdm_rw612.conf
+++ b/ports/zephyr-cp/boards/frdm_rw612.conf
@@ -2,7 +2,6 @@ CONFIG_NETWORKING=y
 CONFIG_NET_IPV4=y
 CONFIG_NET_DHCPV4=y
 CONFIG_NET_SOCKETS=y
-CONFIG_NET_SOCKETS_POSIX_NAMES=y
 
 CONFIG_WIFI=y
 CONFIG_NET_L2_WIFI_MGMT=y
@@ -17,9 +16,9 @@ CONFIG_MBEDTLS=y
 CONFIG_MBEDTLS_SSL_PROTO_TLS1_2=y
 CONFIG_MBEDTLS_RSA_C=y
 CONFIG_MBEDTLS_PKCS1_V15=y
-CONFIG_MBEDTLS_KEY_EXCHANGE_RSA_ENABLED=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED=y
 CONFIG_MBEDTLS_ENTROPY_C=y
-CONFIG_MBEDTLS_CTR_DRBG_ENABLED=y
+CONFIG_MBEDTLS_CTR_DRBG_C=y
 CONFIG_MBEDTLS_SHA1=y
 CONFIG_MBEDTLS_USE_PSA_CRYPTO=n
 
diff --git a/ports/zephyr-cp/boards/frdm_rw612.overlay b/ports/zephyr-cp/boards/frdm_rw612.overlay
index 1c38f42c4abd2..c6a021d999956 100644
--- a/ports/zephyr-cp/boards/frdm_rw612.overlay
+++ b/ports/zephyr-cp/boards/frdm_rw612.overlay
@@ -1,6 +1,6 @@
 &w25q512jvfiq {
     partitions {
-        /delete-node/ storage_partition;
+        /delete-node/ partition@620000;
         circuitpy_partition: partition@620000 {
             label = "circuitpy";
             reg = <0x00620000 (DT_SIZE_M(58) - DT_SIZE_K(128))>;
diff --git a/ports/zephyr-cp/boards/mimxrt1170_evk_mimxrt1176_cm7.overlay b/ports/zephyr-cp/boards/mimxrt1170_evk_mimxrt1176_cm7.overlay
index d6f6d4f0c15e7..89a78998cea74 100644
--- a/ports/zephyr-cp/boards/mimxrt1170_evk_mimxrt1176_cm7.overlay
+++ b/ports/zephyr-cp/boards/mimxrt1170_evk_mimxrt1176_cm7.overlay
@@ -1,10 +1,10 @@
 &is25wp128 {
-    partitions{
-        /delete-node/ storage_partition;
-        circuitpy_partition: partition@E20000 {
-			label = "circuitpy";
-			reg = <0x00E20000 (DT_SIZE_M(2) - DT_SIZE_K(128))>;
-		};
+    partitions {
+        /delete-node/ partition@e20000;
+        circuitpy_partition: partition@e20000 {
+            label = "circuitpy";
+            reg = <0x00e20000 (DT_SIZE_M(2) - DT_SIZE_K(128))>;
+        };
     };
 };
 
diff --git a/ports/zephyr-cp/boards/nrf5340bsim_nrf5340_cpuapp.conf b/ports/zephyr-cp/boards/nrf5340bsim_nrf5340_cpuapp.conf
index f9507bd031926..02e4e0d0d5647 100644
--- a/ports/zephyr-cp/boards/nrf5340bsim_nrf5340_cpuapp.conf
+++ b/ports/zephyr-cp/boards/nrf5340bsim_nrf5340_cpuapp.conf
@@ -6,16 +6,12 @@ CONFIG_GPIO=y
 # Enable Bluetooth stack - bsim is for BT simulation
 CONFIG_BT=y
 CONFIG_BT_HCI=y
-CONFIG_BT_HCI_IPC=y
 CONFIG_BT_OBSERVER=y
 CONFIG_BT_BROADCASTER=y
 
 CONFIG_BT_DEVICE_NAME_DYNAMIC=y
 CONFIG_BT_DEVICE_NAME_MAX=28
 
-# So we can test safe mode
-CONFIG_NATIVE_SIM_REBOOT=y
-
 # Ensure the network core image starts when using native simulator
 CONFIG_NATIVE_SIMULATOR_AUTOSTART_MCU=y
 
diff --git a/ports/zephyr-cp/boards/nxp/frdm_rw612/autogen_board_info.toml b/ports/zephyr-cp/boards/nxp/frdm_rw612/autogen_board_info.toml
index c24d0a8527366..91a2776ae74f9 100644
--- a/ports/zephyr-cp/boards/nxp/frdm_rw612/autogen_board_info.toml
+++ b/ports/zephyr-cp/boards/nxp/frdm_rw612/autogen_board_info.toml
@@ -1,5 +1,5 @@
 # This file is autogenerated when a board is built. Do not edit. Do commit it to git. Other scripts use its info.
-name = "NXP Semiconductors FRDM_RW612"
+name = "NXP Semiconductors FRDM-RW612"
 
 [modules]
 __future__ = true
diff --git a/ports/zephyr-cp/boards/nxp/mimxrt1170_evk/autogen_board_info.toml b/ports/zephyr-cp/boards/nxp/mimxrt1170_evk/autogen_board_info.toml
index b2f384e21c1b6..6f648df82fba7 100644
--- a/ports/zephyr-cp/boards/nxp/mimxrt1170_evk/autogen_board_info.toml
+++ b/ports/zephyr-cp/boards/nxp/mimxrt1170_evk/autogen_board_info.toml
@@ -1,5 +1,5 @@
 # This file is autogenerated when a board is built. Do not edit. Do commit it to git. Other scripts use its info.
-name = "NXP Semiconductors MIMXRT1170-EVK/EVKB"
+name = "NXP Semiconductors MIMXRT1170-EVK"
 
 [modules]
 __future__ = true
diff --git a/ports/zephyr-cp/boards/stm32wba65i_dk1.overlay b/ports/zephyr-cp/boards/stm32wba65i_dk1.overlay
index 1b6e55ba462b3..3b72ffc99845c 100644
--- a/ports/zephyr-cp/boards/stm32wba65i_dk1.overlay
+++ b/ports/zephyr-cp/boards/stm32wba65i_dk1.overlay
@@ -47,15 +47,13 @@
 };
 
 zephyr_udc0: &usbotg_hs {
-	clocks = <&rcc STM32_CLOCK(AHB2, 14)>,
-		 <&rcc STM32_SRC_HSE OTGHS_SEL(0)>;
-	pinctrl-0 = <&usb_otg_hs_dm_pd7 &usb_otg_hs_dp_pd6>;
-	pinctrl-names = "default";
 	status = "okay";
 };
 
 &otghs_phy {
 	/* OTG HS clock source is 32 MHz HSE */
+	clocks = <&rcc STM32_CLOCK(AHB2, 15)>,
+		 <&rcc STM32_SRC_HSE OTGHS_SEL(0)>;
 	clock-reference = "SYSCFG_OTG_HS_PHY_CLK_32MHz";
 	status = "okay";
 };
diff --git a/ports/zephyr-cp/cptools/zephyr2cp.py b/ports/zephyr-cp/cptools/zephyr2cp.py
index 7c78113b95b87..f7d79517195e0 100644
--- a/ports/zephyr-cp/cptools/zephyr2cp.py
+++ b/ports/zephyr-cp/cptools/zephyr2cp.py
@@ -96,6 +96,19 @@
         "D12",
         "D13",
     ],
+    "nordic,expansion-board-header": [
+        "P1_04",
+        "P1_05",
+        "P1_06",
+        "P1_07",
+        "P1_08",
+        "P1_09",
+        "P1_10",
+        "P1_11",
+        "P1_12",
+        "P1_13",
+        "P1_14",
+    ],
     "arducam,dvp-20pin-connector": [
         "SCL",
         "SDA",
@@ -544,16 +557,26 @@ def zephyr_dts_to_cp_board(board_id, portdir, builddir, zephyrbuilddir):  # noqa
             all_ioports.append(node.labels[0])
             if status == "okay":
                 ioports[node.labels[0]] = set(range(0, ngpios))
-        if gpio_map and compatible[0] != "gpio-nexus":
-            i = 0
-            for offset, t, label in gpio_map._markers:
-                if not label:
-                    continue
-                num = int.from_bytes(gpio_map.value[offset + 4 : offset + 8], "big")
-                if (label, num) not in board_names:
-                    board_names[(label, num)] = []
-                board_names[(label, num)].append(CONNECTORS[compatible[0]][i])
-                i += 1
+        if gpio_map and compatible and compatible[0] != "gpio-nexus":
+            connector_pins = CONNECTORS.get(compatible[0], None)
+            if connector_pins is None:
+                logger.warning(f"Unsupported connector mapping compatible: {compatible[0]}")
+            else:
+                i = 0
+                for offset, t, label in gpio_map._markers:
+                    if not label:
+                        continue
+                    if i >= len(connector_pins):
+                        logger.warning(
+                            f"Connector mapping for {compatible[0]} has more pins than names; "
+                            f"stopping at {len(connector_pins)}"
+                        )
+                        break
+                    num = int.from_bytes(gpio_map.value[offset + 4 : offset + 8], "big")
+                    if (label, num) not in board_names:
+                        board_names[(label, num)] = []
+                    board_names[(label, num)].append(connector_pins[i])
+                    i += 1
         if "gpio-leds" in compatible:
             for led in node.nodes:
                 led = node.nodes[led]
diff --git a/ports/zephyr-cp/prj.conf b/ports/zephyr-cp/prj.conf
index d0f4d911c123b..9b4dcccb53e4d 100644
--- a/ports/zephyr-cp/prj.conf
+++ b/ports/zephyr-cp/prj.conf
@@ -1,25 +1,20 @@
 CONFIG_SYS_HEAP_RUNTIME_STATS=n
 CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
-CONFIG_STD_C23=y
 
 CONFIG_DYNAMIC_INTERRUPTS=y
 CONFIG_UART_INTERRUPT_DRIVEN=y
 
 CONFIG_FLASH_MAP_LABELS=y
 CONFIG_MAIN_STACK_SIZE=24288
-CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
-CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
 
 CONFIG_THREAD_STACK_INFO=y
 CONFIG_STACK_SENTINEL=n
 CONFIG_DEBUG_THREAD_INFO=n
-CONFIG_DEBUG_INFO=n
 CONFIG_EXCEPTION_STACK_TRACE=n
 
 CONFIG_USB_DEVICE_STACK_NEXT=y
 CONFIG_USBD_CDC_ACM_CLASS=y
-CONFIG_USBD_MAX_SPEED=1
 CONFIG_USBD_MSC_STACK_SIZE=1536
 CONFIG_CDC_ACM_SERIAL_INITIALIZE_AT_BOOT=n
 
@@ -44,13 +39,8 @@ CONFIG_SPI_ASYNC=y
 
 CONFIG_LOG=y
 CONFIG_LOG_MAX_LEVEL=2
-CONFIG_HW_STACK_PROTECTION=y
 CONFIG_FRAME_POINTER=n
 
-CONFIG_BT_BUF_ACL_TX_COUNT=7
-CONFIG_BT_HCI_ERR_TO_STR=y
-
 CONFIG_NET_HOSTNAME_ENABLE=y
 CONFIG_NET_HOSTNAME_DYNAMIC=y
 CONFIG_NET_HOSTNAME="circuitpython"
-CONFIG_NET_MGMT_EVENT_INFO=y
diff --git a/ports/zephyr-cp/socs/nrf5340_cpuapp.conf b/ports/zephyr-cp/socs/nrf5340_cpuapp.conf
index bf70997d83f29..734d26db8e939 100644
--- a/ports/zephyr-cp/socs/nrf5340_cpuapp.conf
+++ b/ports/zephyr-cp/socs/nrf5340_cpuapp.conf
@@ -1,4 +1,3 @@
 
-CONFIG_NRFX_UARTE0=y
-CONFIG_NRFX_UARTE1=y
+CONFIG_NRFX_UARTE=y
 CONFIG_NRFX_POWER=y
diff --git a/ports/zephyr-cp/socs/stm32h7b3xx.conf b/ports/zephyr-cp/socs/stm32h7b3xx.conf
index 3c7daeb753de8..14a93b52ce802 100644
--- a/ports/zephyr-cp/socs/stm32h7b3xx.conf
+++ b/ports/zephyr-cp/socs/stm32h7b3xx.conf
@@ -1,4 +1 @@
-CONFIG_USE_STM32_LL_USB=y
-CONFIG_USE_STM32_HAL_PCD=y
-
 CONFIG_MEMC=y
diff --git a/ports/zephyr-cp/socs/stm32u575xx.conf b/ports/zephyr-cp/socs/stm32u575xx.conf
index 78cefbfef402f..e69de29bb2d1d 100644
--- a/ports/zephyr-cp/socs/stm32u575xx.conf
+++ b/ports/zephyr-cp/socs/stm32u575xx.conf
@@ -1,2 +0,0 @@
-CONFIG_USE_STM32_LL_USB=y
-CONFIG_USE_STM32_HAL_PCD=y
diff --git a/ports/zephyr-cp/zephyr-config/west.yml b/ports/zephyr-cp/zephyr-config/west.yml
index 3cee04f982b66..bb5c9b4942b35 100644
--- a/ports/zephyr-cp/zephyr-config/west.yml
+++ b/ports/zephyr-cp/zephyr-config/west.yml
@@ -4,10 +4,10 @@ manifest:
   projects:
     - name: nrf_hw_models
       url: https://github.com/tannewt/ext_nRF_hw_models
-      revision: bb351cef9e5ab4d175fe3cb7c4d6761d837bac20
+      revision: c2927847bdf2ee0af9c5459f4155c67f39f6837a
       path: modules/bsim_hw_models/nrf_hw_models
     - name: zephyr
       url: https://github.com/adafruit/zephyr
-      revision: 8801b409ec554cfd217c159c00f91280ea1331db
+      revision: 5351284ac926b1352ab98f5ae692a21f38068beb
       clone-depth: 100
       import: true