diff --git a/recipes-bsp/device-tree/device-tree.bbappend b/recipes-bsp/device-tree/device-tree.bbappend
index b46f37e865fc6ae236f1cd131556e85e90894f18..c7e30fcb4e443679d854ac106b32ce196b64e220 100644
--- a/recipes-bsp/device-tree/device-tree.bbappend
+++ b/recipes-bsp/device-tree/device-tree.bbappend
@@ -3,5 +3,9 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 SRC_URI_append = " \
     file://pl-conf.dtsi \
 "
-# Force for overlay
-DTC_OFLAGS_append =' -f'
+
+# We need what's in pl-conf.
+# We are not using DTBO for now (cannot build)
+do_configure_append() {
+    echo '/include/ "pl-conf.dtsi"'   >> ${DT_FILES_PATH}/system-top.dts
+}
diff --git a/recipes-core/images/zup-image-soleil-fofb.bb b/recipes-core/images/zup-image-soleil-fofb.bb
index 1d9fd5a1cba28a0496899adb308a476731fee17d..7324be19b8e88c683b94983975693b05532ba121 100644
--- a/recipes-core/images/zup-image-soleil-fofb.bb
+++ b/recipes-core/images/zup-image-soleil-fofb.bb
@@ -30,8 +30,6 @@ IMAGE_INSTALL_append = " fofb-opcua-server"
 IMAGE_INSTALL_append = " fofb-init"
 IMAGE_INSTALL_append = " xilinx-xvc-server"
 
-IMAGE_FEATURES_append = " fpga-manager"
-
 # We do not need that
 IMAGE_INSTALL_remove = " git python3-pip sudo"
 IMAGE_INSTALL_remove = " fpgautil-init"
@@ -50,6 +48,3 @@ EXTRA_USERS_PARAMS = "\
     usermod -s /bin/zsh -P 'fofb' root; \
     useradd -s /bin/zsh -G sudo -P 'diag91' diag; \
     "
-
-# If the FPGA system has a Block Design, try to generate the Device Tree
-DT_FROM_BD_ENABLE = "1"