diff --git a/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpuapp_ns.yaml b/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpuapp_ns.yaml
index 4c366d2f363..cec7b107776 100644
--- a/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpuapp_ns.yaml
+++ b/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpuapp_ns.yaml
@@ -18,3 +18,4 @@ supported:
   - gpio
   - spi
 vendor: nordic
+sysbuild: true
diff --git a/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_14_0.yaml b/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_14_0.yaml
index d610095afaf..86161bb4385 100644
--- a/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_14_0.yaml
+++ b/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_14_0.yaml
@@ -19,3 +19,4 @@ supported:
   - netif:modem
   - gpio
 vendor: nordic
+sysbuild: true
diff --git a/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_7_0.yaml b/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_7_0.yaml
index 0faa84b38c9..52b8f85efb4 100644
--- a/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_7_0.yaml
+++ b/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_7_0.yaml
@@ -19,3 +19,4 @@ supported:
   - netif:modem
   - gpio
 vendor: nordic
+sysbuild: true
diff --git a/cmake/linker/ld/target.cmake b/cmake/linker/ld/target.cmake
index c941d8ee89e..d7ac5e41d89 100644
--- a/cmake/linker/ld/target.cmake
+++ b/cmake/linker/ld/target.cmake
@@ -76,7 +76,7 @@ macro(configure_linker_script linker_script_gen linker_pass_define)
       ${current_includes}
       ${soc_linker_script_includes}
       ${template_script_defines}
-      -DUSE_PARTITION_MANAGER=$<OR:$<BOOL:${CONFIG_PARTITION_MANAGER_ENABLED}>,$<BOOL:${IMAGE_NAME}>,$<TARGET_EXISTS:partition_manager>>
+      -DUSE_PARTITION_MANAGER=$<BOOL:${CONFIG_PARTITION_MANAGER_ENABLED}>
       -E ${LINKER_SCRIPT}
       -P # Prevent generation of debug `#line' directives.
       -o ${linker_script_gen}
diff --git a/cmake/modules/kconfig.cmake b/cmake/modules/kconfig.cmake
index 97086cdf19d..02bebbe0851 100644
--- a/cmake/modules/kconfig.cmake
+++ b/cmake/modules/kconfig.cmake
@@ -171,7 +171,6 @@ set(COMMON_KCONFIG_ENV_SETTINGS
   TOOLCHAIN_KCONFIG_DIR=${TOOLCHAIN_KCONFIG_DIR}
   TOOLCHAIN_HAS_NEWLIB=${_local_TOOLCHAIN_HAS_NEWLIB}
   TOOLCHAIN_HAS_PICOLIBC=${_local_TOOLCHAIN_HAS_PICOLIBC}
-  HIDE_CHILD_PARENT_CONFIG=${SYSBUILD}
   EDT_PICKLE=${EDT_PICKLE}
   # Export all Zephyr modules to Kconfig
   ${ZEPHYR_KCONFIG_MODULES_DIR}
diff --git a/samples/subsys/usb/dfu/sysbuild.conf b/samples/subsys/usb/dfu/sysbuild.conf
new file mode 100644
index 00000000000..47f00ff3cff
--- /dev/null
+++ b/samples/subsys/usb/dfu/sysbuild.conf
@@ -0,0 +1 @@
+SB_CONFIG_BOOTLOADER_MCUBOOT=y
diff --git a/tests/drivers/flash/common/sysbuild.conf b/tests/drivers/flash/common/sysbuild.conf
deleted file mode 100644
index 6408669a847..00000000000
--- a/tests/drivers/flash/common/sysbuild.conf
+++ /dev/null
@@ -1 +0,0 @@
-SB_CONFIG_PARTITION_MANAGER=n