diff --git a/layers/meta-belden-coreos-bsp/recipes-bsp/u-boot/u-boot-coreos.inc b/layers/meta-belden-coreos-bsp/recipes-bsp/u-boot/u-boot-coreos.inc
deleted file mode 100644
index cba923d..0000000
--- a/layers/meta-belden-coreos-bsp/recipes-bsp/u-boot/u-boot-coreos.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-# Ensure that file are found event when this file is included in another layer
-# ==============================================================================
-FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot:"
-
-# Main include file for u-boot to ensure CoreOS compatibility
-# ==============================================================================
-
-SRC_URI += " \
-    ${@bb.utils.contains("IMAGE_FEATURES", "debug-tweaks", "file://debug-tweaks.cfg", "", d)} \
-"
-
-require ${@bb.utils.contains("COMBINED_FEATURES", "efi", "u-boot-coreos-efi.inc", "", d)}
diff --git a/layers/meta-belden-coreos-bsp/recipes-bsp/u-boot/u-boot_2022.01.bbappend b/layers/meta-belden-coreos-bsp/recipes-bsp/u-boot/u-boot_2022.01.bbappend
deleted file mode 100644
index 49e2351..0000000
--- a/layers/meta-belden-coreos-bsp/recipes-bsp/u-boot/u-boot_2022.01.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-require u-boot-coreos.inc
diff --git a/layers/meta-belden-coreos-bsp/recipes-bsp/u-boot/u-boot-coreos-efi.inc b/layers/meta-belden-coreos/recipes-bsp/u-boot/u-boot-coreos.inc
similarity index 68%
rename from layers/meta-belden-coreos-bsp/recipes-bsp/u-boot/u-boot-coreos-efi.inc
rename to layers/meta-belden-coreos/recipes-bsp/u-boot/u-boot-coreos.inc
index ea16776..31e3396 100644
--- a/layers/meta-belden-coreos-bsp/recipes-bsp/u-boot/u-boot-coreos-efi.inc
+++ b/layers/meta-belden-coreos/recipes-bsp/u-boot/u-boot-coreos.inc
@@ -1,12 +1,23 @@
+# Ensure that file are found event when this file is included in another layer
+# ==============================================================================
+FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot:"
+
+# U-Boot CoreOS Distro Settings
+# ==============================================================================
+
+# Enable more debug option when debug-tweaks is enabled
+SRC_URI += " \
+    ${@bb.utils.contains("IMAGE_FEATURES", "debug-tweaks", "file://debug-tweaks.cfg", "", d)} \
+"
+
 inherit coreos-efi-secureboot
 
+# Make sure UEFI and secure boot is enabled for every u-boot build
 SRC_URI += " \
     file://uefi.cfg \
     file://uefi-secureboot.cfg \
 "
 
-DEPENDS:append = " ${PYTHON_PN}-pyopenssl-native u-boot-tools-native cos-certificates-and-keys-native"
-
 # Generate a ubootefi.var file inside the build directory
 #
 # This file can be directly linked inside the u-boot binary to provide
@@ -15,6 +26,7 @@ DEPENDS:append = " ${PYTHON_PN}-pyopenssl-native u-boot-tools-native cos-certifi
 #
 # The efivar.py is taken from u-boot-tools recipes, so that we are sure that he
 # is found and don't depend on the u-boot version being used
+DEPENDS:append = " ${PYTHON_PN}-pyopenssl-native u-boot-tools-native cos-certificates-and-keys-native"
 addtask uboot_generate_efivar after do_configure before do_compile
 do_uboot_generate_efivar() {
     # Settings OPENSSL_MODULES is needed, otherwise efivar.py fail with
diff --git a/layers/meta-belden-coreos-bsp/recipes-bsp/u-boot/u-boot-tools_2022.01.bbappend b/layers/meta-belden-coreos/recipes-bsp/u-boot/u-boot-tools_2022.01.bbappend
similarity index 100%
rename from layers/meta-belden-coreos-bsp/recipes-bsp/u-boot/u-boot-tools_2022.01.bbappend
rename to layers/meta-belden-coreos/recipes-bsp/u-boot/u-boot-tools_2022.01.bbappend
diff --git a/layers/meta-belden-coreos-bsp/recipes-bsp/u-boot/u-boot/debug-tweaks.cfg b/layers/meta-belden-coreos/recipes-bsp/u-boot/u-boot/debug-tweaks.cfg
similarity index 100%
rename from layers/meta-belden-coreos-bsp/recipes-bsp/u-boot/u-boot/debug-tweaks.cfg
rename to layers/meta-belden-coreos/recipes-bsp/u-boot/u-boot/debug-tweaks.cfg
diff --git a/layers/meta-belden-coreos-bsp/recipes-bsp/u-boot/u-boot/uefi-secureboot.cfg b/layers/meta-belden-coreos/recipes-bsp/u-boot/u-boot/uefi-secureboot.cfg
similarity index 100%
rename from layers/meta-belden-coreos-bsp/recipes-bsp/u-boot/u-boot/uefi-secureboot.cfg
rename to layers/meta-belden-coreos/recipes-bsp/u-boot/u-boot/uefi-secureboot.cfg
diff --git a/layers/meta-belden-coreos-bsp/recipes-bsp/u-boot/u-boot/uefi.cfg b/layers/meta-belden-coreos/recipes-bsp/u-boot/u-boot/uefi.cfg
similarity index 100%
rename from layers/meta-belden-coreos-bsp/recipes-bsp/u-boot/u-boot/uefi.cfg
rename to layers/meta-belden-coreos/recipes-bsp/u-boot/u-boot/uefi.cfg
diff --git a/layers/meta-belden-coreos/recipes-bsp/u-boot/u-boot_%.bbappend b/layers/meta-belden-coreos/recipes-bsp/u-boot/u-boot_%.bbappend
new file mode 100644
index 0000000..accd28a
--- /dev/null
+++ b/layers/meta-belden-coreos/recipes-bsp/u-boot/u-boot_%.bbappend
@@ -0,0 +1,5 @@
+# Add CoreOS distro settings to u-boot
+UBOOT_COREOS_REQUIRE:coreos ?= "u-boot-coreos.inc"
+UBOOT_COREOS_REQUIRE ?= ""
+
+require ${UBOOT_COREOS_REQUIRE}
diff --git a/layers/meta-belden-coreos-bsp/recipes-bsp/u-boot/u-boot_2022.10.bb b/layers/meta-belden-coreos/recipes-bsp/u-boot/u-boot_2022.10.bb
similarity index 91%
rename from layers/meta-belden-coreos-bsp/recipes-bsp/u-boot/u-boot_2022.10.bb
rename to layers/meta-belden-coreos/recipes-bsp/u-boot/u-boot_2022.10.bb
index 5ae4b92..ca01805 100644
--- a/layers/meta-belden-coreos-bsp/recipes-bsp/u-boot/u-boot_2022.10.bb
+++ b/layers/meta-belden-coreos/recipes-bsp/u-boot/u-boot_2022.10.bb
@@ -4,5 +4,3 @@ require recipes-bsp/u-boot/u-boot.inc
 SRCREV = "4debc57a3da6c3f4d3f89a637e99206f4cea0a96"
 DEPENDS += "bc-native dtc-native python3-setuptools-native"
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1"
-
-require u-boot-coreos.inc
diff --git a/layers/meta-belden-marvell-bsp/recipes-bsp/u-boot/u-boot_2019.10-solidrun.bb b/layers/meta-belden-marvell-bsp/recipes-bsp/u-boot/u-boot_2019.10-solidrun.bb
index 9304ee4..c0bbd3c 100644
--- a/layers/meta-belden-marvell-bsp/recipes-bsp/u-boot/u-boot_2019.10-solidrun.bb
+++ b/layers/meta-belden-marvell-bsp/recipes-bsp/u-boot/u-boot_2019.10-solidrun.bb
@@ -51,7 +51,6 @@ SRC_URI = "git://git.denx.de/u-boot.git;branch=master \
 S = "${WORKDIR}/git"
 
 require recipes-bsp/u-boot/u-boot.inc
-require recipes-bsp/u-boot/u-boot-coreos.inc
 
 # Solidrun patches require to build out-of-the-tree
 B = "${WORKDIR}/build"
diff --git a/layers/meta-belden-marvell-bsp/recipes-bsp/u-boot/u-boot_2023.04-marvell.bb b/layers/meta-belden-marvell-bsp/recipes-bsp/u-boot/u-boot_2023.04-marvell.bb
index ae7c150..9ecee7e 100644
--- a/layers/meta-belden-marvell-bsp/recipes-bsp/u-boot/u-boot_2023.04-marvell.bb
+++ b/layers/meta-belden-marvell-bsp/recipes-bsp/u-boot/u-boot_2023.04-marvell.bb
@@ -30,7 +30,6 @@ SRC_URI = "git://source.denx.de/u-boot/custodians/u-boot-marvell.git;branch=mast
 S = "${WORKDIR}/git"
 
 require recipes-bsp/u-boot/u-boot.inc
-require recipes-bsp/u-boot/u-boot-coreos.inc
 
 # Solidrun patches require to build out-of-the-tree
 B = "${WORKDIR}/build"
diff --git a/layers/meta-netmodule-coreos-bsp/recipes-bsp/u-boot/u-boot-ti-coreos_2023.04.bb b/layers/meta-netmodule-coreos-bsp/recipes-bsp/u-boot/u-boot-ti-coreos_2023.04.bb
index 9180248..fbd6cba 100644
--- a/layers/meta-netmodule-coreos-bsp/recipes-bsp/u-boot/u-boot-ti-coreos_2023.04.bb
+++ b/layers/meta-netmodule-coreos-bsp/recipes-bsp/u-boot/u-boot-ti-coreos_2023.04.bb
@@ -13,8 +13,11 @@ SRCREV = "34cf1e583eb263dd6644d0ebf3468b3846fc0925"
 
 PACKAGECONFIG[atf] = "BL31=${STAGING_DIR_HOST}/firmware/bl31.bin,,trusted-firmware-a"
 
-# Only require coreos include file for the aarch64 build of u-boot
-UBOOT_REQUIRE ?= ""
-UBOOT_REQUIRE:netmodule-hw34 = "recipes-bsp/u-boot/u-boot-coreos.inc"
-require ${UBOOT_REQUIRE}
+# CoreOS enable EFI by default for all u-boot build, but this machine as a dual architecture u-boot
+# and EFI is not needed on the co-processor. So we enable it only for the main
+# machine
+UBOOT_COREOS_REQUIRE:coreos:netmodule-hw34 ?= "recipes-bsp/u-boot/u-boot-coreos.inc"
+UBOOT_COREOS_REQUIRE ?= ""
+
+require ${UBOOT_COREOS_REQUIRE}