diff --git a/documentation/hardware/netmodule-hw34.rst b/documentation/hardware/netmodule-hw34.rst
index cfccf60..0ccf87a 100644
--- a/documentation/hardware/netmodule-hw34.rst
+++ b/documentation/hardware/netmodule-hw34.rst
@@ -6,8 +6,8 @@ NetModule HW34 (XG900 A-Sample)
 
 .. important::
 
-  netmodule-hw34 support is currently only available on the features branch
-  feat/netmodule-bsp
+  netmodule-hw34 (Gemini) support is experimental and available only if the
+  meta-belden-coreos-staging-bsp is enabled
 
 .. image:: netmodule-hw34/hw34.png
 
diff --git a/documentation/hardware/overview.rst b/documentation/hardware/overview.rst
index cce0fa4..02b2b15 100644
--- a/documentation/hardware/overview.rst
+++ b/documentation/hardware/overview.rst
@@ -31,3 +31,19 @@ Supported Hardware
    Please contact the CoreOS team when starting a new project based on CoreOS
    or want to contribute the hardware support for an existing Hardware.
 
+
+Layer Organization
+===================
+
+CoreOS offers various Board Support Package (BSP) layers to accommodate
+different levels of support for machines.
+
+Machines that are fully supported by CoreOS are included in the
+`meta-belden-coreos-bsp` layer. This layer encompasses all the machines that
+meet CoreOS's criteria for full support, ensuring they receive comprehensive
+integration and validation.
+
+Machines in the process of being fully supported by CoreOS, which are currently
+undergoing development and testing, are part of the `meta-belden-coreos-staging-bsp`
+layer. This layer includes machines where the BSP support is still evolving and
+does not yet meet the criteria for full support by CoreOS.
diff --git a/layers/meta-netmodule-coreos-bsp/README.md b/layers/meta-belden-coreos-staging-bsp/README.md
similarity index 100%
rename from layers/meta-netmodule-coreos-bsp/README.md
rename to layers/meta-belden-coreos-staging-bsp/README.md
diff --git a/layers/meta-netmodule-coreos-bsp/classes/coreos-image-swupdate-am64xx.bbclass b/layers/meta-belden-coreos-staging-bsp/classes/coreos-image-swupdate-am64xx.bbclass
similarity index 100%
rename from layers/meta-netmodule-coreos-bsp/classes/coreos-image-swupdate-am64xx.bbclass
rename to layers/meta-belden-coreos-staging-bsp/classes/coreos-image-swupdate-am64xx.bbclass
diff --git a/layers/meta-netmodule-coreos-bsp/conf/layer.conf b/layers/meta-belden-coreos-staging-bsp/conf/layer.conf
similarity index 88%
rename from layers/meta-netmodule-coreos-bsp/conf/layer.conf
rename to layers/meta-belden-coreos-staging-bsp/conf/layer.conf
index ba8fc78..521f599 100644
--- a/layers/meta-netmodule-coreos-bsp/conf/layer.conf
+++ b/layers/meta-belden-coreos-staging-bsp/conf/layer.conf
@@ -5,7 +5,7 @@ BBPATH .= ":${LAYERDIR}"
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
             ${LAYERDIR}/recipes-*/*/*.bbappend"
 
-BBFILE_COLLECTIONS += "netmodule-coreos-bsp-layer"
+BBFILE_COLLECTIONS += "belden-coreos-staging-bsp"
 BBFILE_PATTERN_netmodule-coreos-bsp-layer = "^${LAYERDIR}/"
 BBFILE_PRIORITY_netmodule-coreos-bsp-layer = "8"
 
diff --git a/layers/meta-netmodule-coreos-bsp/conf/machine/include/netmodule-am64xx-common.inc b/layers/meta-belden-coreos-staging-bsp/conf/machine/include/netmodule-am64xx-common.inc
similarity index 100%
rename from layers/meta-netmodule-coreos-bsp/conf/machine/include/netmodule-am64xx-common.inc
rename to layers/meta-belden-coreos-staging-bsp/conf/machine/include/netmodule-am64xx-common.inc
diff --git a/layers/meta-netmodule-coreos-bsp/conf/machine/include/netmodule-am64xx-k3.inc b/layers/meta-belden-coreos-staging-bsp/conf/machine/include/netmodule-am64xx-k3.inc
similarity index 100%
rename from layers/meta-netmodule-coreos-bsp/conf/machine/include/netmodule-am64xx-k3.inc
rename to layers/meta-belden-coreos-staging-bsp/conf/machine/include/netmodule-am64xx-k3.inc
diff --git a/layers/meta-netmodule-coreos-bsp/conf/machine/include/netmodule-am64xx-k3r5.inc b/layers/meta-belden-coreos-staging-bsp/conf/machine/include/netmodule-am64xx-k3r5.inc
similarity index 100%
rename from layers/meta-netmodule-coreos-bsp/conf/machine/include/netmodule-am64xx-k3r5.inc
rename to layers/meta-belden-coreos-staging-bsp/conf/machine/include/netmodule-am64xx-k3r5.inc
diff --git a/layers/meta-netmodule-coreos-bsp/conf/machine/netmodule-hw34-k3r5.conf b/layers/meta-belden-coreos-staging-bsp/conf/machine/netmodule-hw34-k3r5.conf
similarity index 100%
rename from layers/meta-netmodule-coreos-bsp/conf/machine/netmodule-hw34-k3r5.conf
rename to layers/meta-belden-coreos-staging-bsp/conf/machine/netmodule-hw34-k3r5.conf
diff --git a/layers/meta-netmodule-coreos-bsp/conf/machine/netmodule-hw34.conf b/layers/meta-belden-coreos-staging-bsp/conf/machine/netmodule-hw34.conf
similarity index 100%
rename from layers/meta-netmodule-coreos-bsp/conf/machine/netmodule-hw34.conf
rename to layers/meta-belden-coreos-staging-bsp/conf/machine/netmodule-hw34.conf
diff --git a/layers/meta-netmodule-coreos-bsp/recipes-bsp/u-boot/u-boot-ti-coreos_2023.04.bb b/layers/meta-belden-coreos-staging-bsp/recipes-bsp/u-boot/u-boot-ti-coreos_2023.04.bb
similarity index 100%
rename from layers/meta-netmodule-coreos-bsp/recipes-bsp/u-boot/u-boot-ti-coreos_2023.04.bb
rename to layers/meta-belden-coreos-staging-bsp/recipes-bsp/u-boot/u-boot-ti-coreos_2023.04.bb
diff --git a/layers/meta-netmodule-coreos-bsp/recipes-core/udev/udev-gemini/gemini-can.rules b/layers/meta-belden-coreos-staging-bsp/recipes-core/udev/udev-gemini/gemini-can.rules
similarity index 100%
rename from layers/meta-netmodule-coreos-bsp/recipes-core/udev/udev-gemini/gemini-can.rules
rename to layers/meta-belden-coreos-staging-bsp/recipes-core/udev/udev-gemini/gemini-can.rules
diff --git a/layers/meta-netmodule-coreos-bsp/recipes-core/udev/udev-gemini_1.0.bb b/layers/meta-belden-coreos-staging-bsp/recipes-core/udev/udev-gemini_1.0.bb
similarity index 100%
rename from layers/meta-netmodule-coreos-bsp/recipes-core/udev/udev-gemini_1.0.bb
rename to layers/meta-belden-coreos-staging-bsp/recipes-core/udev/udev-gemini_1.0.bb
diff --git a/layers/meta-netmodule-coreos-bsp/recipes-coreos/coreos-installer/coreos-installer-config/netmodule-hw34_1.0.sfdisk b/layers/meta-belden-coreos-staging-bsp/recipes-coreos/coreos-installer/coreos-installer-config/netmodule-hw34_1.0.sfdisk
similarity index 100%
rename from layers/meta-netmodule-coreos-bsp/recipes-coreos/coreos-installer/coreos-installer-config/netmodule-hw34_1.0.sfdisk
rename to layers/meta-belden-coreos-staging-bsp/recipes-coreos/coreos-installer/coreos-installer-config/netmodule-hw34_1.0.sfdisk
diff --git a/layers/meta-netmodule-coreos-bsp/recipes-coreos/coreos-installer/coreos-installer-config_%.bbappend b/layers/meta-belden-coreos-staging-bsp/recipes-coreos/coreos-installer/coreos-installer-config_%.bbappend
similarity index 100%
rename from layers/meta-netmodule-coreos-bsp/recipes-coreos/coreos-installer/coreos-installer-config_%.bbappend
rename to layers/meta-belden-coreos-staging-bsp/recipes-coreos/coreos-installer/coreos-installer-config_%.bbappend
diff --git a/layers/meta-netmodule-coreos-bsp/recipes-kernel/linux/linux-ti-coreos_git-5.10.bb b/layers/meta-belden-coreos-staging-bsp/recipes-kernel/linux/linux-ti-coreos_git-5.10.bb
similarity index 100%
rename from layers/meta-netmodule-coreos-bsp/recipes-kernel/linux/linux-ti-coreos_git-5.10.bb
rename to layers/meta-belden-coreos-staging-bsp/recipes-kernel/linux/linux-ti-coreos_git-5.10.bb
diff --git a/templates/bblayers.conf.sample b/templates/bblayers.conf.sample
index 1500d24..005ec9e 100644
--- a/templates/bblayers.conf.sample
+++ b/templates/bblayers.conf.sample
@@ -9,9 +9,9 @@ BBLAYERS ?= " \
   ##OEROOT##/meta \
   ##COREOS_LAYERSDIR##/meta-belden-coreos \
   ##COREOS_LAYERSDIR##/meta-belden-coreos-bsp \
+  ##COREOS_LAYERSDIR##/meta-belden-coreos-staging-bsp \
   ##COREOS_LAYERSDIR##/meta-belden-coreos-demo \
   ##COREOS_LAYERSDIR##/meta-belden-marvell-bsp \
-  ##COREOS_LAYERSDIR##/meta-netmodule-coreos-bsp \
   ##COREOS_EXTLAYERSDIR##/meta-openembedded/meta-oe \
   ##COREOS_EXTLAYERSDIR##/meta-openembedded/meta-networking \
   ##COREOS_EXTLAYERSDIR##/meta-openembedded/meta-filesystems \