jukkar · ppryga-nordic · Aug 13, 2025 · Sep 9, 2025 · Sep 9, 2025 · Sep 9, 2025
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -35,9 +35,3 @@ add_subdirectory(subsys)
 add_subdirectory(modules)
 add_subdirectory(drivers)
 add_subdirectory(tests)
-
-# TEMPHACK: Add a source file generated by cmake/sysbuild/periphconf_migrate.cmake
-if(SYSBUILD AND CONFIG_NRF_HALTIUM_GENERATE_UICR)
-  file(TOUCH ${APPLICATION_BINARY_DIR}/../periphconf_migrated.c)
-  zephyr_sources(${APPLICATION_BINARY_DIR}/../periphconf_migrated.c)
-endif()
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -526,6 +526,7 @@
 /samples/nrf5340/empty_app_core/          @nrfconnect/ncs-si-muffin
 /samples/nrf5340/extxip_smp_svr/          @nrfconnect/ncs-pluto
 /samples/nrf54h20/empty_app_core/         @nrfconnect/ncs-aurora
+/samples/ironside_se/                     @nrfconnect/ncs-aurora
 /samples/nrf_compress/                    @nordicjm
 /samples/nrf_profiler/                    @nrfconnect/ncs-si-bluebagel
 /samples/nrf_rpc/protocols_serialization/ @nrfconnect/ncs-protocols-serialization
@@ -636,6 +637,7 @@
 /samples/event_manager_proxy/*.rst        @nrfconnect/ncs-si-muffin-doc
 /samples/gazell/**/*.rst                  @nrfconnect/ncs-si-muffin-doc
 /samples/hw_id/*.rst                      @nrfconnect/ncs-cia-doc
+/samples/ironside_se/**/*.rst             @nrfconnect/ncs-aurora-doc
 /samples/ipc/ipc_service/*.rst            @nrfconnect/ncs-si-muffin-doc
 /samples/keys/**/*.rst                    @nrfconnect/ncs-aegir-doc
 /samples/matter/**/*.rst                  @nrfconnect/ncs-matter-doc

diff --git a/applications/connectivity_bridge/prj.conf b/applications/connectivity_bridge/prj.conf
@@ -22,6 +22,8 @@ CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor"
 CONFIG_USB_DEVICE_SN="THINGY91 12PLACEHLDRS" # This is overridden at runtime
 CONFIG_USB_COMPOSITE_DEVICE=y
 CONFIG_USB_CDC_ACM_RINGBUF_SIZE=16384
+# Sample uses deprecated code and needs to be ported to the new USB device stack.
+CONFIG_DEPRECATION_TEST=y
 
 # Disk and file system
 CONFIG_DISK_ACCESS=y

diff --git a/applications/connectivity_bridge/sysbuild/mcuboot/boards/thingy91_nrf52840.conf b/applications/connectivity_bridge/sysbuild/mcuboot/boards/thingy91_nrf52840.conf
@@ -32,3 +32,5 @@ CONFIG_USB_MASS_STORAGE=n
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor"
 CONFIG_USB_DEVICE_VID=0x1915
 CONFIG_USB_DEVICE_PID=0x520F
+# Sample uses deprecated code and needs to be ported to the new USB device stack.
+CONFIG_DEPRECATION_TEST=y
diff --git a/applications/connectivity_bridge/sysbuild/mcuboot/boards/thingy91x_nrf5340_cpuapp.conf b/applications/connectivity_bridge/sysbuild/mcuboot/boards/thingy91x_nrf5340_cpuapp.conf
@@ -33,6 +33,8 @@ CONFIG_USB_MASS_STORAGE=n
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor"
 CONFIG_USB_DEVICE_VID=0x1915
 CONFIG_USB_DEVICE_PID=0x910A
+# Sample uses deprecated code and needs to be ported to the new USB device stack.
+CONFIG_DEPRECATION_TEST=y
 
 CONFIG_BOOT_SERIAL_BOOT_MODE=y
 

diff --git a/applications/connectivity_bridge/sysbuild/mcuboot/prj.conf b/applications/connectivity_bridge/sysbuild/mcuboot/prj.conf
@@ -12,18 +12,11 @@ CONFIG_BOOT_BOOTSTRAP=n
 ### mbedTLS has its own heap
 # CONFIG_HEAP_MEM_POOL_SIZE is not set
 
-### We never want Zephyr's copy of tinycrypt.  If tinycrypt is needed,
-### MCUboot has its own copy in tree.
-# CONFIG_TINYCRYPT is not set
-# CONFIG_TINYCRYPT_ECC_DSA is not set
-# CONFIG_TINYCRYPT_SHA256 is not set
-
 CONFIG_FLASH=y
 CONFIG_FPROTECT=y
 
 ### Various Zephyr boards enable features that we don't want.
 # CONFIG_BT is not set
-# CONFIG_BT_CTLR is not set
 # CONFIG_I2C is not set
 
 CONFIG_LOG=y

diff --git a/applications/machine_learning/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf b/applications/machine_learning/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf
@@ -12,7 +12,6 @@ CONFIG_BT_BUF_ACL_RX_SIZE=502
 CONFIG_BT_MAX_CONN=6
 
 CONFIG_ASSERT=y
-CONFIG_DEBUG_INFO=y
 CONFIG_EXCEPTION_STACK_TRACE=y
 
 # Improve debugging experience by disabling reset on fatal error

diff --git a/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet.conf b/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet.conf
@@ -5,7 +5,6 @@
 #
 
 CONFIG_ASSERT=y
-CONFIG_DEBUG_INFO=y
 CONFIG_EXCEPTION_STACK_TRACE=y
 
 # Improve debugging experience by disabling reset on fatal error

diff --git a/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_ns.conf b/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_ns.conf
@@ -5,7 +5,6 @@
 #
 
 CONFIG_ASSERT=y
-CONFIG_DEBUG_INFO=y
 CONFIG_EXCEPTION_STACK_TRACE=y
 
 # Improve debugging experience by disabling reset on fatal error

diff --git a/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_ns_rtt.conf b/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_ns_rtt.conf
@@ -5,7 +5,6 @@
 #
 
 CONFIG_ASSERT=y
-CONFIG_DEBUG_INFO=y
 CONFIG_EXCEPTION_STACK_TRACE=y
 
 # Improve debugging experience by disabling reset on fatal error

diff --git a/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_rtt.conf b/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_rtt.conf
@@ -5,7 +5,6 @@
 #
 
 CONFIG_ASSERT=y
-CONFIG_DEBUG_INFO=y
 CONFIG_EXCEPTION_STACK_TRACE=y
 
 # Improve debugging experience by disabling reset on fatal error

diff --git a/applications/machine_learning/sysbuild/ipc_radio/prj.conf b/applications/machine_learning/sysbuild/ipc_radio/prj.conf
@@ -16,7 +16,6 @@ CONFIG_BT_HCI_RAW=y
 CONFIG_BT_CTLR_ASSERT_HANDLER=y
 
 CONFIG_ASSERT=y
-CONFIG_DEBUG_INFO=y
 CONFIG_EXCEPTION_STACK_TRACE=y
 
 CONFIG_IPC_RADIO_BT=y

diff --git a/applications/machine_learning/sysbuild/mcuboot/prj.conf b/applications/machine_learning/sysbuild/mcuboot/prj.conf
@@ -18,18 +18,11 @@ CONFIG_BOOT_BOOTSTRAP=n
 ### mbedTLS has its own heap
 # CONFIG_HEAP_MEM_POOL_SIZE is not set
 
-### We never want Zephyr's copy of tinycrypt.  If tinycrypt is needed,
-### MCUboot has its own copy in tree.
-# CONFIG_TINYCRYPT is not set
-# CONFIG_TINYCRYPT_ECC_DSA is not set
-# CONFIG_TINYCRYPT_SHA256 is not set
-
 CONFIG_FLASH=y
 CONFIG_FPROTECT=y
 
 ### Various Zephyr boards enable features that we don't want.
 # CONFIG_BT is not set
-# CONFIG_BT_CTLR is not set
 # CONFIG_I2C is not set
 
 CONFIG_LOG=y

diff --git a/applications/matter_bridge/sysbuild/ipc_radio/prj.conf b/applications/matter_bridge/sysbuild/ipc_radio/prj.conf
@@ -29,7 +29,6 @@ CONFIG_BT_CTLR_PHY_2M=n
 
 # Debug and assert configuration
 CONFIG_ASSERT=y
-CONFIG_DEBUG_INFO=y
 CONFIG_RESET_ON_FATAL_ERROR=n
 CONFIG_REBOOT=n
 

diff --git a/applications/matter_weather_station/prj.conf b/applications/matter_weather_station/prj.conf
@@ -73,10 +73,11 @@ CONFIG_SHELL=y
 CONFIG_SHELL_LOG_BACKEND=y
 
 # Configure USB CDC ACM
-CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n
-CONFIG_USB_DEVICE_PRODUCT="Thingy:53 Matter Weather"
-CONFIG_USB_DEVICE_VID=0x1915
-CONFIG_USB_DEVICE_PID=0x530D
+CONFIG_USB_DEVICE_STACK_NEXT=y
+CONFIG_CDC_ACM_SERIAL_MANUFACTURER_STRING="Nordic Semiconductor ASA"
+CONFIG_CDC_ACM_SERIAL_PRODUCT_STRING="Thingy:53 Matter Weather"
+CONFIG_CDC_ACM_SERIAL_VID=0x1915
+CONFIG_CDC_ACM_SERIAL_PID=0x530D
 CONFIG_UART_LINE_CTRL=y
 CONFIG_SHELL_BACKEND_SERIAL_INIT_PRIORITY=51
 

diff --git a/applications/matter_weather_station/sysbuild/ipc_radio/prj.conf b/applications/matter_weather_station/sysbuild/ipc_radio/prj.conf
@@ -35,7 +35,6 @@ CONFIG_BT_CTLR_PHY_2M=n
 
 # Debug and assert configuration
 CONFIG_ASSERT=y
-CONFIG_DEBUG_INFO=y
 CONFIG_RESET_ON_FATAL_ERROR=n
 CONFIG_REBOOT=n
 

diff --git a/applications/nrf5340_audio/prj.conf b/applications/nrf5340_audio/prj.conf
@@ -11,7 +11,6 @@ CONFIG_SAMPLE_RATE_CONVERTER_FILTER_SIMPLE=y
 
 # General
 CONFIG_DEBUG=y
-CONFIG_DEBUG_INFO=y
 CONFIG_ASSERT=y
 CONFIG_STACK_USAGE=y
 CONFIG_THREAD_RUNTIME_STATS=y
@@ -76,3 +75,6 @@ CONFIG_BT_HCI_CORE_LOG_LEVEL_WRN=y
 CONFIG_BT_ISO_TX_BUF_COUNT=3
 CONFIG_BT_BUF_ACL_TX_COUNT=3
 CONFIG_BT_ATT_TX_COUNT=12
+
+# Suppress the USB deprecation warning
+CONFIG_DEPRECATION_TEST=y
diff --git a/applications/nrf5340_audio/prj_fota.conf b/applications/nrf5340_audio/prj_fota.conf
@@ -12,7 +12,6 @@ CONFIG_SAMPLE_RATE_CONVERTER_FILTER_SIMPLE=y
 
 # General
 CONFIG_DEBUG=y
-CONFIG_DEBUG_INFO=y
 CONFIG_ASSERT=y
 CONFIG_STACK_USAGE=y
 CONFIG_THREAD_RUNTIME_STATS=y
@@ -87,3 +86,7 @@ CONFIG_SPI_NOR_SFDP_DEVICETREE=y
 CONFIG_BT_ISO_TX_BUF_COUNT=3
 CONFIG_BT_BUF_ACL_TX_COUNT=3
 CONFIG_BT_ATT_TX_COUNT=12
+
+
+# Suppress the USB deprecation warning
+CONFIG_DEPRECATION_TEST=y
diff --git a/applications/nrf5340_audio/prj_release.conf b/applications/nrf5340_audio/prj_release.conf
@@ -38,3 +38,7 @@ CONFIG_BT_ATT_TX_COUNT=12
 # USB VID and PID must be changed before production.
 # CONFIG_USB_DEVICE_VID=0x1915
 # CONFIG_USB_DEVICE_PID=0x530A
+
+
+# Suppress the USB deprecation warning
+CONFIG_DEPRECATION_TEST=y
diff --git a/applications/nrf5340_audio/src/bluetooth/bt_stream/broadcast/broadcast_sink.c b/applications/nrf5340_audio/src/bluetooth/bt_stream/broadcast/broadcast_sink.c
@@ -562,7 +562,7 @@ static bool is_any_active_streams(void)
 {
 	for (int i = 0; i < ARRAY_SIZE(audio_streams); i++) {
 		if (audio_streams[i].ep != NULL &&
-		    audio_streams[i].ep->status.state == BT_BAP_EP_STATE_STREAMING) {
+		    audio_streams[i].ep->state == BT_BAP_EP_STATE_STREAMING) {
 			return true;
 		}
 	}

diff --git a/applications/nrf5340_audio/sysbuild/mcuboot/prj_fota.conf b/applications/nrf5340_audio/sysbuild/mcuboot/prj_fota.conf
@@ -16,18 +16,11 @@ CONFIG_BOOT_BOOTSTRAP=n
 ### mbedTLS has its own heap
 # CONFIG_HEAP_MEM_POOL_SIZE is not set
 
-### We never want Zephyr's copy of tinycrypt.  If tinycrypt is needed,
-### MCUboot has its own copy in tree.
-# CONFIG_TINYCRYPT is not set
-# CONFIG_TINYCRYPT_ECC_DSA is not set
-# CONFIG_TINYCRYPT_SHA256 is not set
-
 CONFIG_FLASH=y
 CONFIG_FPROTECT=y
 
 ### Various Zephyr boards enable features that we don't want.
 # CONFIG_BT is not set
-# CONFIG_BT_CTLR is not set
 # CONFIG_I2C is not set
 
 CONFIG_LOG=y

diff --git a/applications/nrf_desktop/board_configuration.rst b/applications/nrf_desktop/board_configuration.rst
@@ -93,6 +93,9 @@ nRF52840 USB Dongle (``nrf52840dongle/nrf52840``) and nRF52833 USB Dongle (``nrf
       * Bluetooth uses Nordic Semiconductor's SoftDevice link layer and is configured to act as a central.
         Input data comes from Bluetooth and is retransmitted to USB.
       * The configuration with the B0 bootloader is set as default for the ``nrf52840dongle/nrf52840`` board and with the MCUboot bootloader is set as default for the ``nrf52833dongle`` board.
+     * The nRF5 MBR partition (``nrf5_mbr``) added by the ``nrf52840dongle/nrf52840`` board is not used.
+       It is statically defined with address and size both set to zero to prevent Partition Manager from trying to place it dynamically.
+       The application did not switch to the ``bare`` board variant to keep backwards compatibility.
 
 nRF52820 USB Dongle (``nrf52820dongle``)
       * The application is configured to act as a dongle that forwards data from both mouse and keyboard.

diff --git a/...cations/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/prj_release.conf b/...cations/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/prj_release.conf
@@ -28,6 +28,9 @@ CONFIG_GPIO=y
 CONFIG_GPIO_NRFX_INTERRUPT=n
 CONFIG_MCUBOOT_SERIAL=y
 CONFIG_BOOT_SERIAL_CDC_ACM=y
+# The MCUboot serial recovery over USB CDC ACM still uses USB legacy stack.
+# Disable deprecation warnings to workaround build failures in CI.
+CONFIG_DEPRECATION_TEST=y
 CONFIG_BOOT_SERIAL_UART=n
 
 # Required by USB

diff --git a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj.conf b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj.conf
@@ -20,6 +20,8 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_DESKTOP_ROLE_HID_DONGLE=y
+# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used.
+CONFIG_DEPRECATION_TEST=y
 CONFIG_DESKTOP_DEVICE_PID=0x52E1
 
 CONFIG_DESKTOP_BLE_PEER_CONTROL=y

diff --git a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj_release.conf b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj_release.conf
@@ -15,6 +15,8 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_DESKTOP_ROLE_HID_DONGLE=y
+# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used.
+CONFIG_DEPRECATION_TEST=y
 CONFIG_DESKTOP_DEVICE_PID=0x52E1
 
 CONFIG_DESKTOP_BLE_PEER_CONTROL=y

diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/prj_release.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/prj_release.conf
@@ -28,6 +28,9 @@ CONFIG_GPIO=y
 CONFIG_GPIO_NRFX_INTERRUPT=n
 CONFIG_MCUBOOT_SERIAL=y
 CONFIG_BOOT_SERIAL_CDC_ACM=y
+# The MCUboot serial recovery over USB CDC ACM still uses USB legacy stack.
+# Disable deprecation warnings to workaround build failures in CI.
+CONFIG_DEPRECATION_TEST=y
 CONFIG_BOOT_SERIAL_UART=n
 
 # Required by USB

diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj.conf
@@ -20,6 +20,8 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_DESKTOP_ROLE_HID_DONGLE=y
+# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used.
+CONFIG_DEPRECATION_TEST=y
 CONFIG_DESKTOP_DEVICE_PID=0x52E1
 
 CONFIG_DESKTOP_BLE_PEER_CONTROL=y

diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj_release.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj_release.conf
@@ -15,6 +15,8 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_DESKTOP_ROLE_HID_DONGLE=y
+# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used.
+CONFIG_DEPRECATION_TEST=y
 CONFIG_DESKTOP_DEVICE_PID=0x52E1
 
 CONFIG_DESKTOP_BLE_PEER_CONTROL=y

diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj.conf
@@ -30,6 +30,9 @@ CONFIG_GPIO=y
 CONFIG_GPIO_NRFX_INTERRUPT=n
 CONFIG_MCUBOOT_SERIAL=y
 CONFIG_BOOT_SERIAL_CDC_ACM=y
+# The MCUboot serial recovery over USB CDC ACM still uses USB legacy stack.
+# Disable deprecation warnings to workaround build failures in CI.
+CONFIG_DEPRECATION_TEST=y
 CONFIG_BOOT_SERIAL_UART=n
 
 # Required by USB

diff --git a/...ations/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj_dongle_small.conf b/...ations/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj_dongle_small.conf
@@ -32,6 +32,9 @@ CONFIG_GPIO=y
 CONFIG_GPIO_NRFX_INTERRUPT=n
 CONFIG_MCUBOOT_SERIAL=y
 CONFIG_BOOT_SERIAL_CDC_ACM=y
+# The MCUboot serial recovery over USB CDC ACM still uses USB legacy stack.
+# Disable deprecation warnings to workaround build failures in CI.
+CONFIG_DEPRECATION_TEST=y
 CONFIG_BOOT_SERIAL_UART=n
 
 # Required by USB

diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj_release.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj_release.conf
@@ -32,6 +32,9 @@ CONFIG_GPIO=y
 CONFIG_GPIO_NRFX_INTERRUPT=n
 CONFIG_MCUBOOT_SERIAL=y
 CONFIG_BOOT_SERIAL_CDC_ACM=y
+# The MCUboot serial recovery over USB CDC ACM still uses USB legacy stack.
+# Disable deprecation warnings to workaround build failures in CI.
+CONFIG_DEPRECATION_TEST=y
 CONFIG_BOOT_SERIAL_UART=n
 
 # Required by USB

diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj.conf
@@ -20,6 +20,8 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_DESKTOP_ROLE_HID_DONGLE=y
+# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used.
+CONFIG_DEPRECATION_TEST=y
 CONFIG_DESKTOP_DEVICE_PID=0x52DC
 
 CONFIG_DESKTOP_BLE_PEER_CONTROL=y

diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj_dongle_small.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj_dongle_small.conf
@@ -25,6 +25,8 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_DESKTOP_ROLE_HID_DONGLE=y
+# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used.
+CONFIG_DEPRECATION_TEST=y
 CONFIG_DESKTOP_DEVICE_PID=0x52E1
 
 CONFIG_DESKTOP_BLE_PEER_CONTROL=y

diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj_release.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj_release.conf
@@ -15,6 +15,8 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_DESKTOP_ROLE_HID_DONGLE=y
+# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used.
+CONFIG_DEPRECATION_TEST=y
 CONFIG_DESKTOP_DEVICE_PID=0x52DC
 
 CONFIG_DESKTOP_BLE_PEER_CONTROL=y

diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj.conf
@@ -30,6 +30,9 @@ CONFIG_GPIO=y
 CONFIG_GPIO_NRFX_INTERRUPT=n
 CONFIG_MCUBOOT_SERIAL=y
 CONFIG_BOOT_SERIAL_CDC_ACM=y
+# The MCUboot serial recovery over USB CDC ACM still uses USB legacy stack.
+# Disable deprecation warnings to workaround build failures in CI.
+CONFIG_DEPRECATION_TEST=y
 CONFIG_BOOT_SERIAL_UART=n
 
 # Required by USB

diff --git a/...cations/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj_release.conf b/...cations/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj_release.conf
@@ -30,6 +30,9 @@ CONFIG_GPIO=y
 CONFIG_GPIO_NRFX_INTERRUPT=n
 CONFIG_MCUBOOT_SERIAL=y
 CONFIG_BOOT_SERIAL_CDC_ACM=y
+# The MCUboot serial recovery over USB CDC ACM still uses USB legacy stack.
+# Disable deprecation warnings to workaround build failures in CI.
+CONFIG_DEPRECATION_TEST=y
 CONFIG_BOOT_SERIAL_UART=n
 
 # Required by USB

diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/prj.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/prj.conf
@@ -20,6 +20,8 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_DESKTOP_ROLE_HID_DONGLE=y
+# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used.
+CONFIG_DEPRECATION_TEST=y
 CONFIG_DESKTOP_DEVICE_PID=0x52E1
 
 CONFIG_DESKTOP_BLE_PEER_CONTROL=y

diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/prj_release.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/prj_release.conf
@@ -15,6 +15,8 @@ CONFIG_CAF_CLICK_DETECTOR=y
 CONFIG_CAF_LEDS=y
 
 CONFIG_DESKTOP_ROLE_HID_DONGLE=y
+# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used.
+CONFIG_DEPRECATION_TEST=y
 CONFIG_DESKTOP_DEVICE_PID=0x52E1
 
 CONFIG_DESKTOP_BLE_PEER_CONTROL=y