diff --git a/doc/nrf/app_dev/device_guides/nrf54h/ug_nrf54h20_suit_recovery.rst b/doc/nrf/app_dev/device_guides/nrf54h/ug_nrf54h20_suit_recovery.rst
index fbaae3316add..a096bec68b0b 100644
--- a/doc/nrf/app_dev/device_guides/nrf54h/ug_nrf54h20_suit_recovery.rst
+++ b/doc/nrf/app_dev/device_guides/nrf54h/ug_nrf54h20_suit_recovery.rst
@@ -129,7 +129,7 @@ To turn an application into a recovery application, the following steps have to
 
    * :kconfig:option:`CONFIG_SUIT_RECOVERY` set to ``y``
    * :kconfig:option:`CONFIG_NRF_REGTOOL_GENERATE_UICR` set to ``n``
-   * :kconfig:option:`CONFIG_NRF_REGTOOL_GENERATE_BICR` set to ``n``
+   * :kconfig:option:`CONFIG_SOC_NRF54H20_GENERATE_BICR` set to ``n``
 
    To do that you can simply paste the following code snippet into your configuration files:
 
@@ -137,7 +137,7 @@ To turn an application into a recovery application, the following steps have to
 
          CONFIG_SUIT_RECOVERY=y
          CONFIG_NRF_REGTOOL_GENERATE_UICR=n
-         CONFIG_NRF_REGTOOL_GENERATE_BICR=n
+         CONFIG_SOC_NRF54H20_GENERATE_BICR=n
 
 #. Create the overlay files to be used by the recovery application.
    In this guide it is assumed that for the application core they are placed in the custom recovery application directory in the :file:`boards/nrf54h20dk_nrf54h20_cpuapp.overlay` file.
diff --git a/samples/suit/flash_companion/prj.conf b/samples/suit/flash_companion/prj.conf
index 24223dfcadf2..02c6f19412f3 100644
--- a/samples/suit/flash_companion/prj.conf
+++ b/samples/suit/flash_companion/prj.conf
@@ -63,7 +63,7 @@ CONFIG_USE_DT_CODE_PARTITION=y
 CONFIG_SUIT_LOCAL_ENVELOPE_GENERATE=n
 CONFIG_SUIT_ENVELOPE_TARGET=""
 CONFIG_NRF_REGTOOL_GENERATE_UICR=n
-CONFIG_NRF_REGTOOL_GENERATE_BICR=n
+CONFIG_SOC_NRF54H20_GENERATE_BICR=n
 
 # Enable canonical zcbor encoding
 CONFIG_ZCBOR_CANONICAL=y
diff --git a/samples/suit/recovery/prj.conf b/samples/suit/recovery/prj.conf
index e038c67f3dc0..db1bcbcb6f1c 100644
--- a/samples/suit/recovery/prj.conf
+++ b/samples/suit/recovery/prj.conf
@@ -11,7 +11,7 @@ CONFIG_SUIT_RECOVERY=y
 # It is the main application which is responsible for flashing and generating the UICR
 # configuration - the recovery application should not do it.
 CONFIG_NRF_REGTOOL_GENERATE_UICR=n
-CONFIG_NRF_REGTOOL_GENERATE_BICR=n
+CONFIG_SOC_NRF54H20_GENERATE_BICR=n
 
 ############
 
diff --git a/samples/suit/recovery/sysbuild/hci_ipc.conf b/samples/suit/recovery/sysbuild/hci_ipc.conf
index c2f546c93beb..9dcfcfa57d18 100644
--- a/samples/suit/recovery/sysbuild/hci_ipc.conf
+++ b/samples/suit/recovery/sysbuild/hci_ipc.conf
@@ -11,7 +11,7 @@ CONFIG_SUIT_RECOVERY=y
 # It is the main application which is responsible for flashing and generating the UICR
 # configuration - the recovery application should not do it.
 CONFIG_NRF_REGTOOL_GENERATE_UICR=n
-CONFIG_NRF_REGTOOL_GENERATE_BICR=n
+CONFIG_SOC_NRF54H20_GENERATE_BICR=n
 
 ###########
 CONFIG_BT_BUF_ACL_RX_SIZE=502