diff --git a/applications/nrf_desktop/Kconfig.ble b/applications/nrf_desktop/Kconfig.ble
index a2c484c5fa91..33eb409c19f0 100644
--- a/applications/nrf_desktop/Kconfig.ble
+++ b/applications/nrf_desktop/Kconfig.ble
@@ -167,13 +167,25 @@ config BT_GATT_UUID16_POOL_SIZE
 
 if BT_DIS
 
-config BT_DIS_MANUF
+config BT_DIS_MANUF_NAME
+	default y
+	help
+	  nRF Desktop enables the Manufacturer Name String characteristic as
+	  part of the DIS configuration.
+
+config BT_DIS_MANUF_NAME_STR
 	default DESKTOP_DEVICE_MANUFACTURER
 	help
 	  nRF Desktop defines common HID device identification values
 	  and passes them as defaults to the Bluetooth DIS configuration.
 
-config BT_DIS_MODEL
+config BT_DIS_MODEL_NUMBER
+	default y
+	help
+	  nRF Desktop enables the Model Number String characteristic as
+	  part of the DIS configuration.
+
+config BT_DIS_MODEL_NUMBER_STR
 	default DESKTOP_DEVICE_PRODUCT
 	help
 	  nRF Desktop defines common HID device identification values
diff --git a/samples/bluetooth/central_nfc_pairing/prj.conf b/samples/bluetooth/central_nfc_pairing/prj.conf
index 21a5c022b4ed..a021341033f2 100644
--- a/samples/bluetooth/central_nfc_pairing/prj.conf
+++ b/samples/bluetooth/central_nfc_pairing/prj.conf
@@ -20,8 +20,9 @@ CONFIG_BT_SCAN_ADDRESS_CNT=1
 CONFIG_BT_DEVICE_NAME="Nordic_NFC_pairing"
 
 CONFIG_BT_DIS=y
+CONFIG_BT_DIS_MANUF_NAME=y
+CONFIG_BT_DIS_MANUF_NAME_STR="NordicSemiconductor"
 CONFIG_BT_DIS_PNP=y
-CONFIG_BT_DIS_MANUF="NordicSemiconductor"
 CONFIG_BT_DIS_PNP_VID_SRC=2
 CONFIG_BT_DIS_PNP_VID=0x1915
 CONFIG_BT_DIS_PNP_PID=0xEEEC
diff --git a/samples/bluetooth/fast_pair/input_device/prj.conf b/samples/bluetooth/fast_pair/input_device/prj.conf
index 60c0ac32e5e9..0b13c7659bba 100644
--- a/samples/bluetooth/fast_pair/input_device/prj.conf
+++ b/samples/bluetooth/fast_pair/input_device/prj.conf
@@ -77,7 +77,8 @@ CONFIG_BT_CONN_CTX=y
 CONFIG_BT_BAS=y
 
 # Fill DIS characteristic to comply with HID over GATT profile
-CONFIG_BT_DIS_MANUF="NordicSemiconductor"
+CONFIG_BT_DIS_MANUF_NAME=y
+CONFIG_BT_DIS_MANUF_NAME_STR="NordicSemiconductor"
 CONFIG_BT_DIS_PNP=y
 CONFIG_BT_DIS_PNP_VID_SRC=2
 CONFIG_BT_DIS_PNP_VID=0x1915
diff --git a/samples/bluetooth/multiple_adv_sets/prj.conf b/samples/bluetooth/multiple_adv_sets/prj.conf
index 8a15a2a1a907..2d98195ff24a 100644
--- a/samples/bluetooth/multiple_adv_sets/prj.conf
+++ b/samples/bluetooth/multiple_adv_sets/prj.conf
@@ -15,8 +15,9 @@ CONFIG_BT_EXT_ADV=y
 CONFIG_BT_EXT_ADV_MAX_ADV_SET=2
 
 CONFIG_BT_DIS=y
+CONFIG_BT_DIS_MANUF_NAME=y
+CONFIG_BT_DIS_MANUF_NAME_STR="Nordic Semiconductor ASA"
 CONFIG_BT_DIS_PNP=y
-CONFIG_BT_DIS_MANUF="Nordic Semiconductor ASA"
 CONFIG_BT_DIS_PNP_VID_SRC=2
 CONFIG_BT_DIS_PNP_VID=0x1915
 CONFIG_BT_DIS_PNP_PID=0xEEF1
diff --git a/samples/bluetooth/peripheral_hids_keyboard/prj.conf b/samples/bluetooth/peripheral_hids_keyboard/prj.conf
index 57b7f262e227..b8227f79aa38 100644
--- a/samples/bluetooth/peripheral_hids_keyboard/prj.conf
+++ b/samples/bluetooth/peripheral_hids_keyboard/prj.conf
@@ -24,8 +24,9 @@ CONFIG_BT_GATT_CHRC_POOL_SIZE=20
 CONFIG_BT_CONN_CTX=y
 
 CONFIG_BT_DIS=y
+CONFIG_BT_DIS_MANUF_NAME=y
+CONFIG_BT_DIS_MANUF_NAME_STR="NordicSemiconductor"
 CONFIG_BT_DIS_PNP=y
-CONFIG_BT_DIS_MANUF="NordicSemiconductor"
 CONFIG_BT_DIS_PNP_VID_SRC=2
 CONFIG_BT_DIS_PNP_VID=0x1915
 CONFIG_BT_DIS_PNP_PID=0xEEEF
diff --git a/samples/bluetooth/peripheral_hids_mouse/prj.conf b/samples/bluetooth/peripheral_hids_mouse/prj.conf
index e2c43634fb7f..b41bc433bf70 100644
--- a/samples/bluetooth/peripheral_hids_mouse/prj.conf
+++ b/samples/bluetooth/peripheral_hids_mouse/prj.conf
@@ -23,8 +23,9 @@ CONFIG_BT_GATT_CHRC_POOL_SIZE=20
 CONFIG_BT_CONN_CTX=y
 
 CONFIG_BT_DIS=y
+CONFIG_BT_DIS_MANUF_NAME=y
+CONFIG_BT_DIS_MANUF_NAME_STR="NordicSemiconductor"
 CONFIG_BT_DIS_PNP=y
-CONFIG_BT_DIS_MANUF="NordicSemiconductor"
 CONFIG_BT_DIS_PNP_VID_SRC=2
 CONFIG_BT_DIS_PNP_VID=0x1915
 CONFIG_BT_DIS_PNP_PID=0xEEEE
diff --git a/samples/bluetooth/peripheral_hids_mouse/prj_bt_rpc.conf b/samples/bluetooth/peripheral_hids_mouse/prj_bt_rpc.conf
index fd22c90bde34..a497c72290ff 100644
--- a/samples/bluetooth/peripheral_hids_mouse/prj_bt_rpc.conf
+++ b/samples/bluetooth/peripheral_hids_mouse/prj_bt_rpc.conf
@@ -24,8 +24,9 @@ CONFIG_BT_GATT_CHRC_POOL_SIZE=20
 CONFIG_BT_CONN_CTX=y
 
 CONFIG_BT_DIS=y
+CONFIG_BT_DIS_MANUF_NAME=y
+CONFIG_BT_DIS_MANUF_NAME_STR="NordicSemiconductor"
 CONFIG_BT_DIS_PNP=y
-CONFIG_BT_DIS_MANUF="NordicSemiconductor"
 CONFIG_BT_DIS_PNP_VID_SRC=2
 CONFIG_BT_DIS_PNP_VID=0x1915
 CONFIG_BT_DIS_PNP_PID=0xEEEE
diff --git a/samples/bluetooth/peripheral_nfc_pairing/prj.conf b/samples/bluetooth/peripheral_nfc_pairing/prj.conf
index e0271c42d6be..ad1e05fea1e8 100644
--- a/samples/bluetooth/peripheral_nfc_pairing/prj.conf
+++ b/samples/bluetooth/peripheral_nfc_pairing/prj.conf
@@ -30,8 +30,9 @@ CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_DEVICE_NAME="Nordic_NFC_pairing"
 
 CONFIG_BT_DIS=y
+CONFIG_BT_DIS_MANUF_NAME=y
+CONFIG_BT_DIS_MANUF_NAME_STR="NordicSemiconductor"
 CONFIG_BT_DIS_PNP=y
-CONFIG_BT_DIS_MANUF="NordicSemiconductor"
 CONFIG_BT_DIS_PNP_VID_SRC=2
 CONFIG_BT_DIS_PNP_VID=0x1915
 CONFIG_BT_DIS_PNP_PID=0xEEEB
diff --git a/west.yml b/west.yml
index dc557be22a86..69092271bcd5 100644
--- a/west.yml
+++ b/west.yml
@@ -70,7 +70,7 @@ manifest:
     # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
     - name: zephyr
       repo-path: sdk-zephyr
-      revision: 776b31e3ebc43993e2e7c2043a2bf1a5beb37815
+      revision: 5605c8c0d3855bc3f50c7a9b9ccd5c32d99b4779
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above