diff --git a/Documentation/platforms/arm/nrf52/boards/arduino-nano-33ble-rev2/index.rst b/Documentation/platforms/arm/nrf52/boards/arduino-nano-33ble-rev2/index.rst
index 5b15f90b0f5..2d8317b9b1c 100644
--- a/Documentation/platforms/arm/nrf52/boards/arduino-nano-33ble-rev2/index.rst
+++ b/Documentation/platforms/arm/nrf52/boards/arduino-nano-33ble-rev2/index.rst
@@ -2,5 +2,7 @@
 Arduino Nano 33 BLE Sense Rev2
 ==============================
 
+.. tags:: chip:nrf52, chip:nrf52832
+
 The `Arduino Nano 33 BLE Sense Rev2 <https://store.arduino.cc/products/nano-33-ble-sense-rev2>`_
 is a development board for the nRF52832 SoC from Arduino.
diff --git a/Documentation/platforms/arm/nrf52/boards/arduino-nano-33ble/index.rst b/Documentation/platforms/arm/nrf52/boards/arduino-nano-33ble/index.rst
index d682cdca681..5feab11f5c0 100644
--- a/Documentation/platforms/arm/nrf52/boards/arduino-nano-33ble/index.rst
+++ b/Documentation/platforms/arm/nrf52/boards/arduino-nano-33ble/index.rst
@@ -2,5 +2,7 @@
 Arduino Nano 33 BLE Sense
 =========================
 
+.. tags:: chip:nrf52, chip:nrf52832
+
 The `Arduino Nano 33 BLE Sense <https://store.arduino.cc/products/arduino-nano-33-ble-sense>`_
 is a development board for the nRF52832 SoC from Arduino.
diff --git a/Documentation/platforms/arm/nrf52/boards/nrf52-feather/intex.rst b/Documentation/platforms/arm/nrf52/boards/nrf52-feather/intex.rst
index 25f63980136..9f9d101b0b7 100644
--- a/Documentation/platforms/arm/nrf52/boards/nrf52-feather/intex.rst
+++ b/Documentation/platforms/arm/nrf52/boards/nrf52-feather/intex.rst
@@ -2,6 +2,8 @@
 Adafruit NRF52 Feather
 ======================
 
+.. tags:: chip:nrf52, chip:nrf52832
+
 The `Adafruit NRF52 Feather <https://www.adafruit.com/product/3406>`_
 is a development board for the nRF52832 SoC from Nordic.
 
diff --git a/Documentation/platforms/arm/nrf52/boards/nrf52832-dk/index.rst b/Documentation/platforms/arm/nrf52/boards/nrf52832-dk/index.rst
index f63015ef326..436dd84a93d 100644
--- a/Documentation/platforms/arm/nrf52/boards/nrf52832-dk/index.rst
+++ b/Documentation/platforms/arm/nrf52/boards/nrf52832-dk/index.rst
@@ -2,6 +2,8 @@
 nRF52832-DK
 ===========
 
+.. tags:: chip:nrf52, chip:nrf52832
+
 The `NRF52832-DK (PCA10040) <https://www.nordicsemi.com/Products/Development-hardware/nrf52-dk>`_
 is a development board for the nRF52832 SoC from Nordic.
 
diff --git a/Documentation/platforms/arm/nrf52/boards/nrf52832-mdk/index.rst b/Documentation/platforms/arm/nrf52/boards/nrf52832-mdk/index.rst
index 17fd92a2c4d..e5cb7bed495 100644
--- a/Documentation/platforms/arm/nrf52/boards/nrf52832-mdk/index.rst
+++ b/Documentation/platforms/arm/nrf52/boards/nrf52832-mdk/index.rst
@@ -2,6 +2,8 @@
 MakerDiary nRF52832-MDK
 =======================
 
+.. tags:: chip:nrf52, chip:nrf52832
+
 The `nRF52832-MDK <https://wiki.makerdiary.co/nrf52832-mdk>`_ is a development board for
 the nRF52832 SoC from Nordic. It features 24 I/Os an on-board RGB led and a chip antenna.
 It also includes an embedded DAPlink debugger which allows to flash/debug and monitor UART
diff --git a/Documentation/platforms/arm/nrf52/boards/nrf52832-sparkfun/index.rst b/Documentation/platforms/arm/nrf52/boards/nrf52832-sparkfun/index.rst
index c717aa66a51..fc7762de2cd 100644
--- a/Documentation/platforms/arm/nrf52/boards/nrf52832-sparkfun/index.rst
+++ b/Documentation/platforms/arm/nrf52/boards/nrf52832-sparkfun/index.rst
@@ -2,6 +2,8 @@
 Sparkfun nRF52832 Breakout
 ==========================
 
+.. tags:: chip:nrf52, chip:nrf52832
+
 The `Sparkfun nRF52832 Breakout <https://wiki.makerdiary.co/nrf52832-mdk>`_ is basic board providing
 access to all I/O pins, a 32kHz crystal and LED. 
 
diff --git a/Documentation/platforms/arm/nrf52/boards/nrf52840-dk/index.rst b/Documentation/platforms/arm/nrf52/boards/nrf52840-dk/index.rst
index 762ad0f8e2a..6375fad4b06 100644
--- a/Documentation/platforms/arm/nrf52/boards/nrf52840-dk/index.rst
+++ b/Documentation/platforms/arm/nrf52/boards/nrf52840-dk/index.rst
@@ -2,6 +2,8 @@
 nRF52840-DK
 ===========
 
+.. tags:: chip:nrf52, chip:nrf52840
+
 The `NRF52840-DK (PCA10056) <https://www.nordicsemi.com/Products/Development-hardware/nRF52840-DK>`_
 is a development board for the nRF52840 SoC from Nordic.
 
diff --git a/Documentation/platforms/arm/nrf52/boards/nrf52840-dongle/index.rst b/Documentation/platforms/arm/nrf52/boards/nrf52840-dongle/index.rst
index 7abf79552b1..77f653b95be 100644
--- a/Documentation/platforms/arm/nrf52/boards/nrf52840-dongle/index.rst
+++ b/Documentation/platforms/arm/nrf52/boards/nrf52840-dongle/index.rst
@@ -2,6 +2,8 @@
 nRF52840-dongle
 ===============
 
+.. tags:: chip:nrf52, chip:nrf52840
+
 The `nRF52840-dongle (PCA10059) <https://www.nordicsemi.com/Products/Development-hardware/nrf52840-dongle>`_
 is a a small, low-cost USB dongle based on nRF52840 from Nordic.
 
diff --git a/Documentation/platforms/arm/nrf52/boards/nrf9160-dk-nrf52/index.rst b/Documentation/platforms/arm/nrf52/boards/nrf9160-dk-nrf52/index.rst
index ccdf7e9efa8..dd2d8d5573f 100644
--- a/Documentation/platforms/arm/nrf52/boards/nrf9160-dk-nrf52/index.rst
+++ b/Documentation/platforms/arm/nrf52/boards/nrf9160-dk-nrf52/index.rst
@@ -2,6 +2,8 @@
 Nordic nRF9160 DK (nRF52840)
 ============================
 
+.. tags:: chip:nrf52, chip:nrf91, chip:nrf52840, chip:nrf9160
+
 The `nRF9160-DK (PCA10090) <https://www.nordicsemi.com/Products/Development-hardware/nrf9160-dk>`_
 is a development board based on the nRF9160 and nRF52840 from Nordic.
 
diff --git a/Documentation/platforms/arm/nrf52/boards/thingy52/index.rst b/Documentation/platforms/arm/nrf52/boards/thingy52/index.rst
index e74df5e0ddb..9c538c9659a 100644
--- a/Documentation/platforms/arm/nrf52/boards/thingy52/index.rst
+++ b/Documentation/platforms/arm/nrf52/boards/thingy52/index.rst
@@ -2,6 +2,8 @@
 Nordic Thingy:52
 =================
 
+.. tags:: chip:nrf52, chip:nrf52832
+
 The `Thingy:52 (PCA20020) <https://www.nordicsemi.com/Products/Development-hardware/Nordic-Thingy-52>`_
 is a prototyping platform build around the nRF52832 from Nordic.
 
diff --git a/Documentation/platforms/arm/nrf52/boards/thingy91-nrf52/index.rst b/Documentation/platforms/arm/nrf52/boards/thingy91-nrf52/index.rst
index 820453eaadb..5856a5024e4 100644
--- a/Documentation/platforms/arm/nrf52/boards/thingy91-nrf52/index.rst
+++ b/Documentation/platforms/arm/nrf52/boards/thingy91-nrf52/index.rst
@@ -2,6 +2,8 @@
 Nordic Thingy:91 (nRF52840)
 ===========================
 
+.. tags:: chip:nrf52, chip:nrf52840
+
 The `Thingy:91 (PCA0035) <https://www.nordicsemi.com/Products/Development-hardware/Nordic-Thingy-91>`_
 is a development board based on the nRF9160 and nRF52840 from Nordic.
 
diff --git a/Documentation/platforms/arm/nrf52/boards/xiao-nrf52840/index.rst b/Documentation/platforms/arm/nrf52/boards/xiao-nrf52840/index.rst
index 880efc9579c..17ef935968d 100644
--- a/Documentation/platforms/arm/nrf52/boards/xiao-nrf52840/index.rst
+++ b/Documentation/platforms/arm/nrf52/boards/xiao-nrf52840/index.rst
@@ -2,6 +2,8 @@
 Seeed Studio XIAO nRF52840
 ==========================
 
+.. tags:: chip:nrf52, chip:nrf52840
+
 The `Seeed Studio XIAO nRF52840 <https://wiki.seeedstudio.com/XIAO_BLE/>`_ is a general purpose board supplied by
 Seeed Studio and it is compatible with the Nordic nRF52840 ecosystem as they share the same MCU.
 
diff --git a/Documentation/platforms/arm/nrf53/boards/nrf5340-audio-dk/index.rst b/Documentation/platforms/arm/nrf53/boards/nrf5340-audio-dk/index.rst
index ba479895bf5..fde198db267 100644
--- a/Documentation/platforms/arm/nrf53/boards/nrf5340-audio-dk/index.rst
+++ b/Documentation/platforms/arm/nrf53/boards/nrf5340-audio-dk/index.rst
@@ -2,6 +2,8 @@
 Nordic nRF5340-Audio-DK
 =======================
 
+.. tags:: chip:nrf53, chip:nrf5340
+
 The `nRF5340-Audio-DK <https://www.nordicsemi.com/Products/Development-hardware/nRF5340-Audio-DK>`_
 is a development kit dedicated for Bluetooth LE Audio application based on the nRF5340 from Nordic.
 
diff --git a/Documentation/platforms/arm/nrf53/boards/nrf5340-dk/index.rst b/Documentation/platforms/arm/nrf53/boards/nrf5340-dk/index.rst
index a68384b9fbd..74a93163bd4 100644
--- a/Documentation/platforms/arm/nrf53/boards/nrf5340-dk/index.rst
+++ b/Documentation/platforms/arm/nrf53/boards/nrf5340-dk/index.rst
@@ -2,6 +2,8 @@
 Nordic nRF5340 DK
 =================
 
+.. tags:: chip:nrf53, chip:nrf5340
+
 The `nRF5340-DK (PCA10092) <https://www.nordicsemi.com/Products/Development-hardware/nrf5340-dk>`_
 is a development board based on the nRF5340 from Nordic.
 
diff --git a/Documentation/platforms/arm/nrf53/boards/thingy53/index.rst b/Documentation/platforms/arm/nrf53/boards/thingy53/index.rst
index c9a42d6a0f3..faa55bd7432 100644
--- a/Documentation/platforms/arm/nrf53/boards/thingy53/index.rst
+++ b/Documentation/platforms/arm/nrf53/boards/thingy53/index.rst
@@ -2,6 +2,8 @@
 Nordic Thingy:53
 ================
 
+.. tags:: chip:nrf53, chip:nrf5340
+
 The `Thingy:53 (PCA20053) <https://www.nordicsemi.com/Products/Development-hardware/Nordic-Thingy-53>`_
 is a prototyping platform build around the nRF5340 from Nordic.
 
diff --git a/Documentation/platforms/arm/nrf91/boards/nrf9160-dk/index.rst b/Documentation/platforms/arm/nrf91/boards/nrf9160-dk/index.rst
index 2ee29b4d57d..0f552ccfbd0 100644
--- a/Documentation/platforms/arm/nrf91/boards/nrf9160-dk/index.rst
+++ b/Documentation/platforms/arm/nrf91/boards/nrf9160-dk/index.rst
@@ -2,6 +2,8 @@
 Nordic nRF9160 DK (nRF9160)
 ===========================
 
+.. tags:: chip:nrf91, chip:nrf9160
+
 The `nRF9160-DK (PCA10090) <https://www.nordicsemi.com/Products/Development-hardware/nrf9160-dk>`_
 is a development board based on the nRF9160 and nRF52840 from Nordic.
 
diff --git a/Documentation/platforms/arm/nrf91/boards/thingy91/index.rst b/Documentation/platforms/arm/nrf91/boards/thingy91/index.rst
index eee70057c5d..7e6c1e26312 100644
--- a/Documentation/platforms/arm/nrf91/boards/thingy91/index.rst
+++ b/Documentation/platforms/arm/nrf91/boards/thingy91/index.rst
@@ -2,6 +2,8 @@
 Nordic Thingy:91
 =================
 
+.. tags:: chip:nrf91, chip:nrf52, chip:nrf9160, chip:nrf52840
+
 The `Thingy:91 (PCA0035) <https://www.nordicsemi.com/Products/Development-hardware/Nordic-Thingy-91>`_
 is a development board based on the nRF9160 and nRF52840 from Nordic.