diff --git a/applications/ipc_radio/README.rst b/applications/ipc_radio/README.rst
index 6c78b02cf072..3e13943a27e7 100644
--- a/applications/ipc_radio/README.rst
+++ b/applications/ipc_radio/README.rst
@@ -122,6 +122,9 @@ For instructions on how to enable a specific configuration overlay file, see :re
 .. note::
    You cannot use :ref:`ble_rpc` together with the HCI :ref:`bluetooth_controller`.
 
+.. note::
+   |54H_engb_2_8|
+
 Dependencies
 ************
 
diff --git a/applications/machine_learning/app_desc.rst b/applications/machine_learning/app_desc.rst
index e3b87672e3a9..9c6dc2e7d782 100644
--- a/applications/machine_learning/app_desc.rst
+++ b/applications/machine_learning/app_desc.rst
@@ -448,6 +448,8 @@ nRF54H20 DK
    .. note::
       This application does not work in the default configuration for the nRF54H20 DK without additional parameters like shields or snippets.
 
+      |54H_engb_2_8|
+
   To build the application for the nRF54H20 DK with the sensor sampling done by the Application core (single-core application), run the following command:
 
   .. code-block:: console
diff --git a/applications/matter_bridge/doc/matter_bridge_description.rst b/applications/matter_bridge/doc/matter_bridge_description.rst
index 8a2ffde836c7..ea5ac0a06269 100644
--- a/applications/matter_bridge/doc/matter_bridge_description.rst
+++ b/applications/matter_bridge/doc/matter_bridge_description.rst
@@ -732,6 +732,10 @@ Once connected, run the following command to build the sample:
 
       west build -b nrf54h20dk/nrf54h20/cpuapp -p -- -DSB_CONFIG_WIFI_NRF70=y -DCONFIG_CHIP_WIFI=y -Dmatter_bridge_SHIELD=nrf7002eb_interposer_p1
 
+.. note::
+   |54H_engb_2_8|
+
+
 Selecting a configuration
 =========================
 
diff --git a/applications/nrf_desktop/description.rst b/applications/nrf_desktop/description.rst
index f4a14c6258a9..b314bc8b2843 100644
--- a/applications/nrf_desktop/description.rst
+++ b/applications/nrf_desktop/description.rst
@@ -900,6 +900,9 @@ The nRF Desktop application is built the same way to any other |NCS| application
 .. note::
    Information about the known issues in nRF Desktop can be found in |NCS|'s :ref:`release_notes` and on the :ref:`known_issues` page.
 
+.. note::
+   |54H_engb_2_8|
+
 .. _nrf_desktop_selecting_build_types:
 
 Selecting a build type
diff --git a/doc/nrf/shortcuts.txt b/doc/nrf/shortcuts.txt
index 657831af3764..7420dc1d8090 100644
--- a/doc/nrf/shortcuts.txt
+++ b/doc/nrf/shortcuts.txt
@@ -249,3 +249,6 @@
    When using any other DK, the Toolchain Manager installation is recommended for the |NCS| v1.9.x and earlier versions.
 
 .. |filter_samples_by_board| replace:: If you want to list samples available for one or more specific boards, `use the nRF Connect for Visual Studio Code extension to filter them <Browse samples_>`_.
+
+.. |54H_engb_2_8| replace:: When using the nRF54H20 DK Engineering B (from v0.8.0 to 0.8.2), you must build samples and applications using the board revision 0.8.0 with the ``<board>@<revision>`` syntax.
+   For example, ``nrf54h20dk@0.8.0/nrf54h20/cpuapp`` when building for the application core, or ``nrf54h20dk@0.8.0/nrf54h20/cpurad`` when building for the radio core.
diff --git a/samples/app_event_manager/README.rst b/samples/app_event_manager/README.rst
index d80c80b5bd9c..867b3f1829fe 100644
--- a/samples/app_event_manager/README.rst
+++ b/samples/app_event_manager/README.rst
@@ -54,6 +54,8 @@ Building and running
 
 .. include:: /includes/build_and_run_ns.txt
 
+.. note::
+   |54H_engb_2_8|
 
 Testing
 =======
diff --git a/samples/benchmarks/coremark/README.rst b/samples/benchmarks/coremark/README.rst
index 07ffe64a6cab..8d5a0e169515 100644
--- a/samples/benchmarks/coremark/README.rst
+++ b/samples/benchmarks/coremark/README.rst
@@ -167,6 +167,9 @@ After flashing, messages describing the benchmark state will appear in the conso
 
 .. include:: /includes/nRF54H20_erase_UICR.txt
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 =======
 
diff --git a/samples/bluetooth/central_and_peripheral_hr/README.rst b/samples/bluetooth/central_and_peripheral_hr/README.rst
index b71cb5ee918d..7970d3c5915a 100644
--- a/samples/bluetooth/central_and_peripheral_hr/README.rst
+++ b/samples/bluetooth/central_and_peripheral_hr/README.rst
@@ -86,6 +86,9 @@ Building and running
 
 .. include:: /includes/nRF54H20_erase_UICR.txt
 
+.. note::
+   |54H_engb_2_8|
+
 .. _central_and_peripheral_hrs_testing:
 
 Testing
diff --git a/samples/bluetooth/central_bas/README.rst b/samples/bluetooth/central_bas/README.rst
index bf10b2e77a3a..2130ece58050 100644
--- a/samples/bluetooth/central_bas/README.rst
+++ b/samples/bluetooth/central_bas/README.rst
@@ -59,6 +59,9 @@ Building and running
 
 .. include:: /includes/build_and_run_ns.txt
 
+.. note::
+   |54H_engb_2_8|
+
 .. _central_bas_testing:
 
 
diff --git a/samples/bluetooth/central_hids/README.rst b/samples/bluetooth/central_hids/README.rst
index 9e6945194578..1fe3cacd7191 100644
--- a/samples/bluetooth/central_hids/README.rst
+++ b/samples/bluetooth/central_hids/README.rst
@@ -96,6 +96,9 @@ Building and Running
 
 .. include:: /includes/nRF54H20_erase_UICR.txt
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 =======
 
diff --git a/samples/bluetooth/central_hr_coded/README.rst b/samples/bluetooth/central_hr_coded/README.rst
index cd360d1da849..b6f45a0013a6 100644
--- a/samples/bluetooth/central_hr_coded/README.rst
+++ b/samples/bluetooth/central_hr_coded/README.rst
@@ -36,6 +36,9 @@ Building and running
 
 .. include:: /includes/build_and_run.txt
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 =======
 
diff --git a/samples/bluetooth/central_uart/README.rst b/samples/bluetooth/central_uart/README.rst
index 7650c4c703ff..c9a37b1245f7 100644
--- a/samples/bluetooth/central_uart/README.rst
+++ b/samples/bluetooth/central_uart/README.rst
@@ -54,6 +54,9 @@ Building and running
 
 .. include:: /includes/nRF54H20_erase_UICR.txt
 
+.. note::
+   |54H_engb_2_8|
+
 .. _central_uart_testing:
 
 Testing
diff --git a/samples/bluetooth/direct_test_mode/README.rst b/samples/bluetooth/direct_test_mode/README.rst
index 3db7345bb061..2a3d3af61eae 100644
--- a/samples/bluetooth/direct_test_mode/README.rst
+++ b/samples/bluetooth/direct_test_mode/README.rst
@@ -420,6 +420,9 @@ After programming the sample to your development kit, you can test it in three w
 .. note::
    For the |nRF5340DKnoref|, see :ref:`logging_cpunet` for information about the COM terminals on which the logging output is available.
 
+.. note::
+   |54H_engb_2_8|
+
 .. _direct_test_mode_testing_anritsu:
 
 Testing with a certified tester
diff --git a/samples/bluetooth/event_trigger/README.rst b/samples/bluetooth/event_trigger/README.rst
index 9f980c12383f..daeb551f7017 100644
--- a/samples/bluetooth/event_trigger/README.rst
+++ b/samples/bluetooth/event_trigger/README.rst
@@ -29,6 +29,9 @@ Building and running
 
 .. include:: /includes/build_and_run.txt
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 =======
 
diff --git a/samples/bluetooth/llpm/README.rst b/samples/bluetooth/llpm/README.rst
index 0f8f42929b64..7377f46513c9 100644
--- a/samples/bluetooth/llpm/README.rst
+++ b/samples/bluetooth/llpm/README.rst
@@ -94,6 +94,9 @@ Building and running
 
 .. include:: /includes/nRF54H20_erase_UICR.txt
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 =======
 
diff --git a/samples/bluetooth/multiple_adv_sets/README.rst b/samples/bluetooth/multiple_adv_sets/README.rst
index cd2cecccbbe9..e37df300d80c 100644
--- a/samples/bluetooth/multiple_adv_sets/README.rst
+++ b/samples/bluetooth/multiple_adv_sets/README.rst
@@ -67,6 +67,9 @@ Building and running
 
 .. include:: /includes/build_and_run_ns.txt
 
+.. note::
+   |54H_engb_2_8|
+
 .. _multiple_adv_sets_testing:
 
 Testing
diff --git a/samples/bluetooth/peripheral_ams_client/README.rst b/samples/bluetooth/peripheral_ams_client/README.rst
index c609a282050e..7f31ca7f2525 100644
--- a/samples/bluetooth/peripheral_ams_client/README.rst
+++ b/samples/bluetooth/peripheral_ams_client/README.rst
@@ -85,6 +85,9 @@ Building and running
 
 .. include:: /includes/build_and_run_ns.txt
 
+.. note::
+   |54H_engb_2_8|
+
 .. _peripheral_ams_client_testing:
 
 Testing
diff --git a/samples/bluetooth/peripheral_ancs_client/README.rst b/samples/bluetooth/peripheral_ancs_client/README.rst
index 71fa8be96c9d..58c422224279 100644
--- a/samples/bluetooth/peripheral_ancs_client/README.rst
+++ b/samples/bluetooth/peripheral_ancs_client/README.rst
@@ -72,6 +72,9 @@ Building and running
 
 .. include:: /includes/build_and_run_ns.txt
 
+.. note::
+   |54H_engb_2_8|
+
 .. _peripheral_ancs_client_testing:
 
 Testing
diff --git a/samples/bluetooth/peripheral_bms/README.rst b/samples/bluetooth/peripheral_bms/README.rst
index 30b8246e76d0..d05835226b10 100644
--- a/samples/bluetooth/peripheral_bms/README.rst
+++ b/samples/bluetooth/peripheral_bms/README.rst
@@ -52,6 +52,9 @@ Building and running
 
 .. include:: /includes/build_and_run.txt
 
+.. note::
+   |54H_engb_2_8|
+
 .. _peripheral_bms_testing:
 
 Testing
diff --git a/samples/bluetooth/peripheral_cgms/README.rst b/samples/bluetooth/peripheral_cgms/README.rst
index 9e0c231de79b..93ed887a90b2 100644
--- a/samples/bluetooth/peripheral_cgms/README.rst
+++ b/samples/bluetooth/peripheral_cgms/README.rst
@@ -31,6 +31,9 @@ Building and running
 
 .. |sample path| replace:: :file:`samples/bluetooth/peripheral_cgms`
 
+.. note::
+   |54H_engb_2_8|
+
 .. include:: /includes/build_and_run_ns.txt
 
 Testing
diff --git a/samples/bluetooth/peripheral_cts_client/README.rst b/samples/bluetooth/peripheral_cts_client/README.rst
index bcd59f4ac53f..b1f101301bfe 100644
--- a/samples/bluetooth/peripheral_cts_client/README.rst
+++ b/samples/bluetooth/peripheral_cts_client/README.rst
@@ -61,6 +61,9 @@ Building and running
 
 .. include:: /includes/build_and_run_ns.txt
 
+.. note::
+   |54H_engb_2_8|
+
 .. _peripheral_cts_client_testing:
 
 Testing
diff --git a/samples/bluetooth/peripheral_gatt_dm/README.rst b/samples/bluetooth/peripheral_gatt_dm/README.rst
index 8c83f8644d7d..d2737c4dc52a 100644
--- a/samples/bluetooth/peripheral_gatt_dm/README.rst
+++ b/samples/bluetooth/peripheral_gatt_dm/README.rst
@@ -53,6 +53,9 @@ Building and running
 
 .. include:: /includes/build_and_run_ns.txt
 
+.. note::
+   |54H_engb_2_8|
+
 .. _peripheral_gatt_dm_testing:
 
 Testing
diff --git a/samples/bluetooth/peripheral_hids_keyboard/README.rst b/samples/bluetooth/peripheral_hids_keyboard/README.rst
index a5fe59012a98..fafd245ade12 100644
--- a/samples/bluetooth/peripheral_hids_keyboard/README.rst
+++ b/samples/bluetooth/peripheral_hids_keyboard/README.rst
@@ -145,6 +145,9 @@ Building and running
 
 .. include:: /includes/nRF54H20_erase_UICR.txt
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 =======
 
diff --git a/samples/bluetooth/peripheral_hids_mouse/README.rst b/samples/bluetooth/peripheral_hids_mouse/README.rst
index e0dffdb326ef..c9293e54d354 100644
--- a/samples/bluetooth/peripheral_hids_mouse/README.rst
+++ b/samples/bluetooth/peripheral_hids_mouse/README.rst
@@ -113,6 +113,9 @@ To build this sample with the :ref:`ble_rpc` library, add the following paramete
 
 .. include:: /includes/nRF54H20_erase_UICR.txt
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 =======
 
diff --git a/samples/bluetooth/peripheral_hr_coded/README.rst b/samples/bluetooth/peripheral_hr_coded/README.rst
index 5a1770699142..4c42d4cec48b 100644
--- a/samples/bluetooth/peripheral_hr_coded/README.rst
+++ b/samples/bluetooth/peripheral_hr_coded/README.rst
@@ -58,6 +58,8 @@ Building and running
 
 .. include:: /includes/build_and_run.txt
 
+.. note::
+   |54H_engb_2_8|
 
 Testing
 =======
diff --git a/samples/bluetooth/peripheral_lbs/README.rst b/samples/bluetooth/peripheral_lbs/README.rst
index 2f89f569d21c..45d433a3e7fa 100644
--- a/samples/bluetooth/peripheral_lbs/README.rst
+++ b/samples/bluetooth/peripheral_lbs/README.rst
@@ -117,6 +117,9 @@ Building and running
 
 .. include:: /includes/nRF54H20_erase_UICR.txt
 
+.. note::
+   |54H_engb_2_8|
+
 Minimal build
 =============
 
diff --git a/samples/bluetooth/peripheral_nfc_pairing/README.rst b/samples/bluetooth/peripheral_nfc_pairing/README.rst
index 34e38681f9a2..5147efd062df 100644
--- a/samples/bluetooth/peripheral_nfc_pairing/README.rst
+++ b/samples/bluetooth/peripheral_nfc_pairing/README.rst
@@ -111,6 +111,9 @@ Building and running
 
 .. include:: /includes/build_and_run_ns.txt
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 =======
 
diff --git a/samples/bluetooth/peripheral_rscs/README.rst b/samples/bluetooth/peripheral_rscs/README.rst
index 3b9f02f95356..81c0db51643c 100644
--- a/samples/bluetooth/peripheral_rscs/README.rst
+++ b/samples/bluetooth/peripheral_rscs/README.rst
@@ -57,6 +57,9 @@ Building and running
 
 .. include:: /includes/nRF54H20_erase_UICR.txt
 
+.. note::
+   |54H_engb_2_8|
+
 .. _peripheral_rscs_testing:
 
 Testing
diff --git a/samples/bluetooth/peripheral_status/README.rst b/samples/bluetooth/peripheral_status/README.rst
index a669943faa4b..0beb9ab0a5ef 100644
--- a/samples/bluetooth/peripheral_status/README.rst
+++ b/samples/bluetooth/peripheral_status/README.rst
@@ -128,6 +128,9 @@ Building and running
 
 .. include:: /includes/build_and_run_ns.txt
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 =======
 
diff --git a/samples/bluetooth/peripheral_uart/README.rst b/samples/bluetooth/peripheral_uart/README.rst
index 8b62a0af6fb7..1d8be34a7824 100644
--- a/samples/bluetooth/peripheral_uart/README.rst
+++ b/samples/bluetooth/peripheral_uart/README.rst
@@ -178,6 +178,9 @@ Building and running
 
 .. include:: /includes/nRF54H20_erase_UICR.txt
 
+.. note::
+   |54H_engb_2_8|
+
 Experimental nRF54H20 SoC radio core only build
 ===============================================
 
diff --git a/samples/bluetooth/radio_coex_1wire/README.rst b/samples/bluetooth/radio_coex_1wire/README.rst
index 0c8bd5f80bb1..bedb9af183bb 100644
--- a/samples/bluetooth/radio_coex_1wire/README.rst
+++ b/samples/bluetooth/radio_coex_1wire/README.rst
@@ -65,6 +65,9 @@ Building and running
 
 .. include:: /includes/build_and_run.txt
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 =======
 
diff --git a/samples/bluetooth/radio_notification_cb/README.rst b/samples/bluetooth/radio_notification_cb/README.rst
index 4297c6480a97..970c912e5533 100644
--- a/samples/bluetooth/radio_notification_cb/README.rst
+++ b/samples/bluetooth/radio_notification_cb/README.rst
@@ -31,6 +31,9 @@ Building and running
 
 .. include:: /includes/build_and_run.txt
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 =======
 
diff --git a/samples/bluetooth/shell_bt_nus/README.rst b/samples/bluetooth/shell_bt_nus/README.rst
index 4cb8636cdf8c..0b8c240e485e 100644
--- a/samples/bluetooth/shell_bt_nus/README.rst
+++ b/samples/bluetooth/shell_bt_nus/README.rst
@@ -35,6 +35,9 @@ Building and running
 
 .. include:: /includes/build_and_run_ns.txt
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 *******
 
diff --git a/samples/bluetooth/subrating/README.rst b/samples/bluetooth/subrating/README.rst
index 541c18d7395d..4099ba171117 100644
--- a/samples/bluetooth/subrating/README.rst
+++ b/samples/bluetooth/subrating/README.rst
@@ -69,6 +69,9 @@ Building and running
 
 .. include:: /includes/build_and_run.txt
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 =======
 
diff --git a/samples/bluetooth/throughput/README.rst b/samples/bluetooth/throughput/README.rst
index d9e1a558564f..b632eedf4c2f 100644
--- a/samples/bluetooth/throughput/README.rst
+++ b/samples/bluetooth/throughput/README.rst
@@ -119,6 +119,9 @@ Building and running
 
 .. include:: /includes/nRF54H20_erase_UICR.txt
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 =======
 
diff --git a/samples/caf_sensor_manager/README.rst b/samples/caf_sensor_manager/README.rst
index 7d83891ef81b..cb1a699abb5a 100644
--- a/samples/caf_sensor_manager/README.rst
+++ b/samples/caf_sensor_manager/README.rst
@@ -78,6 +78,9 @@ Complete the following steps to program the sample:
 
 .. include:: /includes/nRF54H20_erase_UICR.txt
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 =======
 
diff --git a/samples/crypto/aes_cbc/README.rst b/samples/crypto/aes_cbc/README.rst
index 82b91a7d0a18..53ff858ff58f 100644
--- a/samples/crypto/aes_cbc/README.rst
+++ b/samples/crypto/aes_cbc/README.rst
@@ -45,6 +45,9 @@ Building and running
 
 .. include:: /includes/build_and_run_ns.txt
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 =======
 
diff --git a/samples/crypto/aes_ccm/README.rst b/samples/crypto/aes_ccm/README.rst
index 46a1dfdada63..45142c17d1d9 100644
--- a/samples/crypto/aes_ccm/README.rst
+++ b/samples/crypto/aes_ccm/README.rst
@@ -46,6 +46,9 @@ Building and running
 
 .. include:: /includes/build_and_run_ns.txt
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 =======
 
diff --git a/samples/crypto/aes_ctr/README.rst b/samples/crypto/aes_ctr/README.rst
index 614ee39c04ae..87258ac01d7b 100644
--- a/samples/crypto/aes_ctr/README.rst
+++ b/samples/crypto/aes_ctr/README.rst
@@ -45,6 +45,9 @@ Building and running
 
 .. include:: /includes/build_and_run_ns.txt
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 =======
 
diff --git a/samples/crypto/aes_gcm/README.rst b/samples/crypto/aes_gcm/README.rst
index 07a8b0cbf654..b80b7c25da1c 100644
--- a/samples/crypto/aes_gcm/README.rst
+++ b/samples/crypto/aes_gcm/README.rst
@@ -45,6 +45,9 @@ Building and running
 
 .. include:: /includes/build_and_run_ns.txt
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 =======
 
diff --git a/samples/crypto/chachapoly/README.rst b/samples/crypto/chachapoly/README.rst
index cc07cc1ab822..04d832835221 100644
--- a/samples/crypto/chachapoly/README.rst
+++ b/samples/crypto/chachapoly/README.rst
@@ -47,6 +47,9 @@ Building and running
 
 .. include:: /includes/build_and_run_ns.txt
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 =======
 
diff --git a/samples/crypto/ecdh/README.rst b/samples/crypto/ecdh/README.rst
index 44f89b416554..9a4444f93120 100644
--- a/samples/crypto/ecdh/README.rst
+++ b/samples/crypto/ecdh/README.rst
@@ -41,6 +41,9 @@ Building and running
 
 .. include:: /includes/build_and_run_ns.txt
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 =======
 
diff --git a/samples/crypto/ecdsa/README.rst b/samples/crypto/ecdsa/README.rst
index 4d9e73c653a4..0d4da80de094 100644
--- a/samples/crypto/ecdsa/README.rst
+++ b/samples/crypto/ecdsa/README.rst
@@ -46,6 +46,9 @@ Building and running
 
 .. include:: /includes/build_and_run_ns.txt
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 =======
 
diff --git a/samples/crypto/ecjpake/README.rst b/samples/crypto/ecjpake/README.rst
index a823a579b941..6af619d74394 100644
--- a/samples/crypto/ecjpake/README.rst
+++ b/samples/crypto/ecjpake/README.rst
@@ -32,6 +32,10 @@ Building and running
 
 .. |sample path| replace:: :file:`samples/crypto/ecjpake`
 
+.. include:: /includes/build_and_run_ns.txt
+
+.. note::
+   |54H_engb_2_8|
 
 Testing
 =======
diff --git a/samples/crypto/eddsa/README.rst b/samples/crypto/eddsa/README.rst
index 5dff1e11a84e..a96404a17333 100644
--- a/samples/crypto/eddsa/README.rst
+++ b/samples/crypto/eddsa/README.rst
@@ -46,6 +46,9 @@ Building and running
 
 .. include:: /includes/build_and_run_ns.txt
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 =======
 
diff --git a/samples/crypto/hkdf/README.rst b/samples/crypto/hkdf/README.rst
index 920808e0965e..da325100e2fd 100644
--- a/samples/crypto/hkdf/README.rst
+++ b/samples/crypto/hkdf/README.rst
@@ -41,6 +41,9 @@ Building and running
 
 .. include:: /includes/build_and_run_ns.txt
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 =======
 
diff --git a/samples/crypto/hmac/README.rst b/samples/crypto/hmac/README.rst
index 87115ff5b999..c896ca6df87e 100644
--- a/samples/crypto/hmac/README.rst
+++ b/samples/crypto/hmac/README.rst
@@ -43,6 +43,9 @@ Building and running
 
 .. include:: /includes/build_and_run_ns.txt
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 =======
 
diff --git a/samples/crypto/pbkdf2/README.rst b/samples/crypto/pbkdf2/README.rst
index 3d1b3dc26720..2a922ab8dbbe 100644
--- a/samples/crypto/pbkdf2/README.rst
+++ b/samples/crypto/pbkdf2/README.rst
@@ -42,6 +42,9 @@ Building and running
 
 .. include:: /includes/build_and_run_ns.txt
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 =======
 
diff --git a/samples/crypto/rng/README.rst b/samples/crypto/rng/README.rst
index 9e82af115d42..c3ad76b9aaa4 100644
--- a/samples/crypto/rng/README.rst
+++ b/samples/crypto/rng/README.rst
@@ -36,6 +36,9 @@ Building and running
 
 .. include:: /includes/build_and_run_ns.txt
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 =======
 
diff --git a/samples/crypto/sha256/README.rst b/samples/crypto/sha256/README.rst
index 26f25eaa5d9f..a89bf89e5cdd 100644
--- a/samples/crypto/sha256/README.rst
+++ b/samples/crypto/sha256/README.rst
@@ -37,6 +37,9 @@ Building and running
 
 .. include:: /includes/build_and_run_ns.txt
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 =======
 
diff --git a/samples/crypto/spake2p/README.rst b/samples/crypto/spake2p/README.rst
index 68fd8cf516cd..099991b390af 100644
--- a/samples/crypto/spake2p/README.rst
+++ b/samples/crypto/spake2p/README.rst
@@ -30,6 +30,9 @@ Building and running
 
 .. |sample path| replace:: :file:`samples/crypto/spake2p`
 
+.. note::
+   |54H_engb_2_8|
+
 
 Testing
 =======
diff --git a/samples/esb/esb_prx/README.rst b/samples/esb/esb_prx/README.rst
index f69b759e0c83..2fdf12d97d59 100644
--- a/samples/esb/esb_prx/README.rst
+++ b/samples/esb/esb_prx/README.rst
@@ -52,6 +52,9 @@ See :ref:`building` and :ref:`programming` for information about how to build an
 
 .. include:: /includes/nRF54H20_erase_UICR.txt
 
+.. note::
+   |54H_engb_2_8|
+
 FEM support
 ===========
 
diff --git a/samples/esb/esb_ptx/README.rst b/samples/esb/esb_ptx/README.rst
index af797ab9383a..42316cea9746 100644
--- a/samples/esb/esb_ptx/README.rst
+++ b/samples/esb/esb_ptx/README.rst
@@ -52,6 +52,9 @@ See :ref:`building` and :ref:`programming` for information about how to build an
 
 .. include:: /includes/nRF54H20_erase_UICR.txt
 
+.. note::
+   |54H_engb_2_8|
+
 FEM support
 ===========
 
diff --git a/samples/event_manager_proxy/README.rst b/samples/event_manager_proxy/README.rst
index 9cefe0e3a707..21c1d1729b0d 100644
--- a/samples/event_manager_proxy/README.rst
+++ b/samples/event_manager_proxy/README.rst
@@ -103,6 +103,9 @@ Complete the following steps to program the sample:
 
 .. include:: /includes/nRF54H20_erase_UICR.txt
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 =======
 
diff --git a/samples/ipc/ipc_service/README.rst b/samples/ipc/ipc_service/README.rst
index 33736ec75d8a..75fb13fa6765 100644
--- a/samples/ipc/ipc_service/README.rst
+++ b/samples/ipc/ipc_service/README.rst
@@ -111,6 +111,9 @@ To build the sample to test IPC between the application and PPR core using the :
 
 .. include:: /includes/nRF54H20_erase_UICR.txt
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 =======
 
diff --git a/samples/matter/lock/README.rst b/samples/matter/lock/README.rst
index cbf017134843..01351af80ee2 100644
--- a/samples/matter/lock/README.rst
+++ b/samples/matter/lock/README.rst
@@ -481,6 +481,9 @@ See `Configuration`_ for information about building the sample with the DFU supp
 
     west build -b nrf54h20dk/nrf54h20/cpuapp -p -- -DSB_CONFIG_WIFI_NRF70=y -DCONFIG_CHIP_WIFI=y -Dlock_SHIELD=nrf7002eb_interposer_p1
 
+.. note::
+   |54H_engb_2_8|
+
 Selecting a configuration
 =========================
 
diff --git a/samples/matter/template/README.rst b/samples/matter/template/README.rst
index 51cc6612b6f8..6c90b2c18854 100644
--- a/samples/matter/template/README.rst
+++ b/samples/matter/template/README.rst
@@ -204,6 +204,9 @@ To use nrf54H20 DK with the ``nrf7002ek`` shield attached (2.4 GHz or 5 GHz), fo
 
     west build -b nrf54h20dk/nrf54h20/cpuapp -p -- -DSB_CONFIG_WIFI_NRF70=y -DCONFIG_CHIP_WIFI=y -Dtemplate_SHIELD=nrf7002eb_interposer_p1
 
+.. note::
+   |54H_engb_2_8|
+
 Selecting a configuration
 =========================
 
diff --git a/samples/mpsl/timeslot/README.rst b/samples/mpsl/timeslot/README.rst
index 3b3b68296a6f..bd58287241e6 100644
--- a/samples/mpsl/timeslot/README.rst
+++ b/samples/mpsl/timeslot/README.rst
@@ -47,6 +47,9 @@ Building and running
 
 .. include:: /includes/build_and_run.txt
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 =======
 
diff --git a/samples/nfc/record_launch_app/README.rst b/samples/nfc/record_launch_app/README.rst
index 2bb635852a24..6f630938cb7f 100644
--- a/samples/nfc/record_launch_app/README.rst
+++ b/samples/nfc/record_launch_app/README.rst
@@ -57,6 +57,9 @@ Building and running
 .. note::
    |nfc_nfct_driver_note|
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 =======
 
diff --git a/samples/nfc/record_text/README.rst b/samples/nfc/record_text/README.rst
index fe996e40aa5c..40b95d5a01b5 100644
--- a/samples/nfc/record_text/README.rst
+++ b/samples/nfc/record_text/README.rst
@@ -57,6 +57,9 @@ Building and running
 .. note::
    |nfc_nfct_driver_note|
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 =======
 
diff --git a/samples/nfc/shell/README.rst b/samples/nfc/shell/README.rst
index 1ab65d4c6d34..9f34ac6f3380 100644
--- a/samples/nfc/shell/README.rst
+++ b/samples/nfc/shell/README.rst
@@ -78,6 +78,9 @@ Building and running
 .. note::
    |nfc_nfct_driver_note|
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 =======
 
diff --git a/samples/nfc/tnep_tag/README.rst b/samples/nfc/tnep_tag/README.rst
index 5bf8fdf55e00..606b4cec2726 100644
--- a/samples/nfc/tnep_tag/README.rst
+++ b/samples/nfc/tnep_tag/README.rst
@@ -73,6 +73,9 @@ Building and running
 .. note::
    |nfc_nfct_driver_note|
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 =======
 
diff --git a/samples/nfc/writable_ndef_msg/README.rst b/samples/nfc/writable_ndef_msg/README.rst
index 092901c592e4..3b791eb48aeb 100644
--- a/samples/nfc/writable_ndef_msg/README.rst
+++ b/samples/nfc/writable_ndef_msg/README.rst
@@ -73,6 +73,9 @@ Building and running
 .. note::
    |nfc_nfct_driver_note|
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 =======
 
diff --git a/samples/openthread/cli/README.rst b/samples/openthread/cli/README.rst
index 7dc54ea61cbb..d5fc41bca426 100644
--- a/samples/openthread/cli/README.rst
+++ b/samples/openthread/cli/README.rst
@@ -149,6 +149,9 @@ Building and running
 
 .. include:: /includes/build_and_run_ns.txt
 
+.. note::
+   |54H_engb_2_8|
+
 To update the OpenThread libraries provided by ``nrfxlib``, use the following commands:
 
 .. parsed-literal::
diff --git a/samples/peripheral/802154_phy_test/README.rst b/samples/peripheral/802154_phy_test/README.rst
index 41079cab2d2b..e0a6dae3b01d 100644
--- a/samples/peripheral/802154_phy_test/README.rst
+++ b/samples/peripheral/802154_phy_test/README.rst
@@ -925,6 +925,9 @@ Building and running
    This sample uses the :ref:`shell_ipc_readme` library to forward shell data through the physical UART interface of the application core.
    The Remote IPC shell sample is built and programmed automatically by default.
 
+.. note::
+   |54H_engb_2_8|
+
 .. _802154_phy_test_testing:
 
 Testing the sample
diff --git a/samples/peripheral/radio_test/README.rst b/samples/peripheral/radio_test/README.rst
index 8834295153ac..b2b4c7a92005 100644
--- a/samples/peripheral/radio_test/README.rst
+++ b/samples/peripheral/radio_test/README.rst
@@ -193,6 +193,9 @@ Building and running
 
 .. include:: /includes/nRF54H20_erase_UICR.txt
 
+.. note::
+   |54H_engb_2_8|
+
 .. note::
    On the nRF5340 or nRF7002 development kit, the Radio Test sample requires the :ref:`nrf5340_remote_shell` sample on the application core.
    The Remote IPC shell sample is built and programmed automatically by default.
diff --git a/samples/pmic/native/npm1300_fuel_gauge/README.rst b/samples/pmic/native/npm1300_fuel_gauge/README.rst
index d5a4eef6d029..4e61136ac1cb 100644
--- a/samples/pmic/native/npm1300_fuel_gauge/README.rst
+++ b/samples/pmic/native/npm1300_fuel_gauge/README.rst
@@ -102,6 +102,9 @@ Building and running
 
 .. include:: /includes/build_and_run.txt
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 *******
 
diff --git a/samples/pmic/native/npm1300_one_button/README.rst b/samples/pmic/native/npm1300_one_button/README.rst
index 441ff1cc8340..edd93dcd0eb9 100644
--- a/samples/pmic/native/npm1300_one_button/README.rst
+++ b/samples/pmic/native/npm1300_one_button/README.rst
@@ -103,6 +103,9 @@ Building and running
 
 .. include:: /includes/build_and_run.txt
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 *******
 
diff --git a/samples/sdfw/ssf_client/README.rst b/samples/sdfw/ssf_client/README.rst
index f7f55420113f..70de017f1e0c 100644
--- a/samples/sdfw/ssf_client/README.rst
+++ b/samples/sdfw/ssf_client/README.rst
@@ -35,6 +35,9 @@ Building and running
 
 .. include:: /includes/build_and_run.txt
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 =======
 
diff --git a/samples/suit/smp_transfer/README.rst b/samples/suit/smp_transfer/README.rst
index d9dd3df4b903..1463bad123be 100644
--- a/samples/suit/smp_transfer/README.rst
+++ b/samples/suit/smp_transfer/README.rst
@@ -139,6 +139,9 @@ Building and running
 
 This sample can be found under |sample path| in the |NCS| folder structure.
 
+.. note::
+   |54H_engb_2_8|
+
 .. note::
     |sysbuild_autoenabled_ncs|
 
diff --git a/samples/wifi/radio_test/sample_description.rst b/samples/wifi/radio_test/sample_description.rst
index d3f1c98318da..9f6a0925d8fa 100644
--- a/samples/wifi/radio_test/sample_description.rst
+++ b/samples/wifi/radio_test/sample_description.rst
@@ -73,6 +73,10 @@ The following is an example of the CLI command:
 
 See also :ref:`cmake_options` for instructions on how to provide CMake options.
 
+.. note::
+   |54H_engb_2_8|
+
+
 Testing
 =======
 
diff --git a/samples/wifi/scan/README.rst b/samples/wifi/scan/README.rst
index d2b7f25c9139..9e6df3611049 100644
--- a/samples/wifi/scan/README.rst
+++ b/samples/wifi/scan/README.rst
@@ -76,6 +76,9 @@ The following are examples of the CLI commands:
 
    west build -b nrf7002dk/nrf5340/cpuapp -- -DCONFIG_WIFI_MGMT_RAW_SCAN_RESULTS=y
 
+.. note::
+   |54H_engb_2_8|
+
 Testing
 =======
 
diff --git a/samples/wifi/shell/README.rst b/samples/wifi/shell/README.rst
index 3736b12f0beb..9c5001c421ab 100644
--- a/samples/wifi/shell/README.rst
+++ b/samples/wifi/shell/README.rst
@@ -98,6 +98,11 @@ The following is an example of the CLI commands:
 
 See also :ref:`cmake_options` for instructions on how to provide CMake options.
 
+
+.. note::
+   |54H_engb_2_8|
+
+
 Supported CLI commands
 ======================
 
diff --git a/samples/wifi/sta/README.rst b/samples/wifi/sta/README.rst
index 6cf312358438..7066f24b526a 100644
--- a/samples/wifi/sta/README.rst
+++ b/samples/wifi/sta/README.rst
@@ -103,6 +103,11 @@ The following is an example of the CLI command:
 
    west build -b nrf7002dk/nrf5340/cpuapp
 
+
+.. note::
+   |54H_engb_2_8|
+
+
 Testing
 =======