diff --git a/layers/meta-belden-coreos-bsp/recipes-kernel/linux/linux-yocto_%.bbappend b/layers/meta-belden-coreos-bsp/recipes-kernel/linux/linux-yocto_%.bbappend
deleted file mode 100644
index e2c6aba..0000000
--- a/layers/meta-belden-coreos-bsp/recipes-kernel/linux/linux-yocto_%.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-# Set kernel config needed by secure-storage
-SRC_URI += "file://secure-storage.cfg"
diff --git a/layers/meta-belden-coreos-bsp/recipes-kernel/linux/linux-yocto_5.15.bbappend b/layers/meta-belden-coreos-bsp/recipes-kernel/linux/linux-yocto_5.15.bbappend
index 2043a18..f3847fa 100644
--- a/layers/meta-belden-coreos-bsp/recipes-kernel/linux/linux-yocto_5.15.bbappend
+++ b/layers/meta-belden-coreos-bsp/recipes-kernel/linux/linux-yocto_5.15.bbappend
@@ -4,7 +4,7 @@ COMPATIBLE_MACHINE:vm-x64 = "vm-x64"
 
 # Enable some kernel features related to virtualiuzation
 KERNEL_FEATURES:append:vm-x64=" cfg/virtio.scc cfg/paravirt_kvm.scc"
-
+SRC_URI:append:vm-x64 = " file://hyperv.cfg"
 
 KMACHINE:eagle40-03 ?= "common-pc-64"
 KBRANCH:eagle40-03 = "v5.15/standard/base"
@@ -18,8 +18,3 @@ KMACHINE:beaglebone ?= "beaglebone"
 SRCREV_machine:beaglebone ?= "9aabbaa89fcb21af7028e814c1f5b61171314d5a"
 COMPATIBLE_MACHINE:beaglebone = "beaglebone"
 LINUX_VERSION:beaglebone = "5.15.54"
-
-require ${@bb.utils.contains("COMBINED_FEATURES", "efi", "linux-yocto-coreos-efi.inc", "", d)}
-
-SRC_URI += " file://k3s_kernel_adaptions.cfg"
-SRC_URI:append:vm-x64 = " file://hyperv.cfg"
diff --git a/layers/meta-belden-coreos-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend b/layers/meta-belden-coreos-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend
index da6a60f..98f52a0 100644
--- a/layers/meta-belden-coreos-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend
+++ b/layers/meta-belden-coreos-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend
@@ -11,6 +11,4 @@ COMPATIBLE_MACHINE:vm-x64 = "vm-x64"
 KERNEL_FEATURES:append:vm-x64=" cfg/virtio.scc cfg/paravirt_kvm.scc"
 SRC_URI:append:vm-x64 = " file://hyperv.cfg"
 
-require ${@bb.utils.contains("COMBINED_FEATURES", "efi", "linux-yocto-coreos-efi.inc", "", d)}
-
 SRC_URI += " file://eagle40-03.cfg"
diff --git a/layers/meta-belden-coreos-bsp/recipes-kernel/linux/files/secure-storage.cfg b/layers/meta-belden-coreos/recipes-kernel/linux/files/secure-storage.cfg
similarity index 100%
rename from layers/meta-belden-coreos-bsp/recipes-kernel/linux/files/secure-storage.cfg
rename to layers/meta-belden-coreos/recipes-kernel/linux/files/secure-storage.cfg
diff --git a/layers/meta-belden-coreos-bsp/recipes-kernel/linux/linux-yocto-coreos-efi.inc b/layers/meta-belden-coreos/recipes-kernel/linux/linux-yocto-coreos.inc
similarity index 67%
rename from layers/meta-belden-coreos-bsp/recipes-kernel/linux/linux-yocto-coreos-efi.inc
rename to layers/meta-belden-coreos/recipes-kernel/linux/linux-yocto-coreos.inc
index 686d3c6..3243c52 100644
--- a/layers/meta-belden-coreos-bsp/recipes-kernel/linux/linux-yocto-coreos-efi.inc
+++ b/layers/meta-belden-coreos/recipes-kernel/linux/linux-yocto-coreos.inc
@@ -1,9 +1,16 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
+# Secure Storage
+# ==============================================================================
+SRC_URI += "file://secure-storage.cfg"
+
+# EFI Support
+# ==============================================================================
 inherit coreos-efi-sbsign
 require conf/image-uefi.conf
 
 # Ensure EFI STUB is enabled
-KERNEL_FEATURES:append = " cfg/efi.scc cfg/efi-ext.scc"
+KERNEL_FEATURES += "cfg/efi.scc cfg/efi-ext.scc"
 
 # By default we use a Unified Kernel Image that contain the kernel, the
 # kernel command line and some device tree, so we don't need to sign the output
@@ -19,5 +26,4 @@ kernel_do_deploy:append() {
         coreos_efi_secureboot_sign_app "$deployDir/$baseName${KERNEL_IMAGE_BIN_EXT}"
       done
     fi
-}
-
+}
\ No newline at end of file
diff --git a/layers/meta-belden-coreos/recipes-kernel/linux/linux-yocto_%.bbappend b/layers/meta-belden-coreos/recipes-kernel/linux/linux-yocto_%.bbappend
new file mode 100644
index 0000000..b75b801
--- /dev/null
+++ b/layers/meta-belden-coreos/recipes-kernel/linux/linux-yocto_%.bbappend
@@ -0,0 +1,6 @@
+# Add CoreOS distro settings to the linux-yocto recipes
+
+LINUX_YOCTO_COREOS_REQUIRE ?= ""
+LINUX_YOCTO_COREOS_REQUIRE:coreos = "linux-yocto-coreos.inc"
+
+require ${LINUX_YOCTO_COREOS_REQUIRE}
diff --git a/layers/meta-belden-marvell-bsp/recipes-kernel/linux/linux-netmodule_git-5.15-solidrun.bb b/layers/meta-belden-marvell-bsp/recipes-kernel/linux/linux-netmodule_git-5.15-solidrun.bb
index fe9eba1..356a284 100644
--- a/layers/meta-belden-marvell-bsp/recipes-kernel/linux/linux-netmodule_git-5.15-solidrun.bb
+++ b/layers/meta-belden-marvell-bsp/recipes-kernel/linux/linux-netmodule_git-5.15-solidrun.bb
@@ -32,4 +32,4 @@ do_configure:append(){
     fi
 }
 
-require recipes-kernel/linux/linux-yocto-coreos-efi.inc
+require recipes-kernel/linux/linux-yocto-coreos.inc
diff --git a/layers/meta-netmodule-coreos-bsp/recipes-kernel/linux/linux-ti-coreos_git-5.10.bb b/layers/meta-netmodule-coreos-bsp/recipes-kernel/linux/linux-ti-coreos_git-5.10.bb
index fd1867e..99e18fc 100644
--- a/layers/meta-netmodule-coreos-bsp/recipes-kernel/linux/linux-ti-coreos_git-5.10.bb
+++ b/layers/meta-netmodule-coreos-bsp/recipes-kernel/linux/linux-ti-coreos_git-5.10.bb
@@ -23,4 +23,4 @@ do_configure:append(){
     fi
 }
 
-require recipes-kernel/linux/linux-yocto-coreos-efi.inc
+require recipes-kernel/linux/linux-yocto-coreos.inc