diff --git a/meta-romulus/conf/machine/romulus.conf b/meta-romulus/conf/machine/romulus.conf
index 4b580a2..2c3c621 100644
--- a/meta-romulus/conf/machine/romulus.conf
+++ b/meta-romulus/conf/machine/romulus.conf
@@ -1,6 +1,7 @@
 KMACHINE = "aspeed"
 KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb"
 
+PHOSPHOR_FAN_CONFIG_USE_NATIVE_SYSROOT = "0"
 UBOOT_MACHINE = "ast_g5_ncsi_config"
 
 PREFERRED_PROVIDER_virtual/p9-vcs-workaround = ''
diff --git a/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-events-config-native.bbappend b/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-events-config-native.bbappend
deleted file mode 100644
index 4db6f3a..0000000
--- a/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-events-config-native.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${PN}:"
diff --git a/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-events-config.bbappend b/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-events-config.bbappend
new file mode 100644
index 0000000..781af4f
--- /dev/null
+++ b/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-events-config.bbappend
@@ -0,0 +1 @@
+FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${BPN}:"
diff --git a/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-events-config-native/events.yaml b/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-events-config/events.yaml
similarity index 100%
rename from meta-romulus/recipes-phosphor/fans/phosphor-fan-control-events-config-native/events.yaml
rename to meta-romulus/recipes-phosphor/fans/phosphor-fan-control-events-config/events.yaml
diff --git a/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bbappend b/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bbappend
deleted file mode 100644
index 4db6f3a..0000000
--- a/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${PN}:"
diff --git a/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-fan-config.bbappend b/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-fan-config.bbappend
new file mode 100644
index 0000000..781af4f
--- /dev/null
+++ b/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-fan-config.bbappend
@@ -0,0 +1 @@
+FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${BPN}:"
diff --git a/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-fan-config-native/fans.yaml b/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-fan-config/fans.yaml
similarity index 100%
rename from meta-romulus/recipes-phosphor/fans/phosphor-fan-control-fan-config-native/fans.yaml
rename to meta-romulus/recipes-phosphor/fans/phosphor-fan-control-fan-config/fans.yaml
diff --git a/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native.bbappend b/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native.bbappend
deleted file mode 100644
index 4db6f3a..0000000
--- a/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${PN}:"
diff --git a/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bbappend b/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bbappend
new file mode 100644
index 0000000..781af4f
--- /dev/null
+++ b/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bbappend
@@ -0,0 +1 @@
+FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${BPN}:"
diff --git a/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native/zone_conditions.yaml b/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config/zone_conditions.yaml
similarity index 100%
rename from meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native/zone_conditions.yaml
rename to meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config/zone_conditions.yaml
diff --git a/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-config-native.bbappend b/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-config-native.bbappend
deleted file mode 100644
index 7be43dd..0000000
--- a/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-config-native.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${PN}:"
-
diff --git a/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-config.bbappend b/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-config.bbappend
new file mode 100644
index 0000000..83b54c4
--- /dev/null
+++ b/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-config.bbappend
@@ -0,0 +1,2 @@
+FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${BPN}:"
+
diff --git a/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-config-native/zones.yaml b/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-config/zones.yaml
similarity index 100%
rename from meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-config-native/zones.yaml
rename to meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-config/zones.yaml
diff --git a/meta-romulus/recipes-phosphor/fans/phosphor-fan-monitor-config-native.bbappend b/meta-romulus/recipes-phosphor/fans/phosphor-fan-monitor-config-native.bbappend
deleted file mode 100644
index 4db6f3a..0000000
--- a/meta-romulus/recipes-phosphor/fans/phosphor-fan-monitor-config-native.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${PN}:"
diff --git a/meta-romulus/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend b/meta-romulus/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend
new file mode 100644
index 0000000..781af4f
--- /dev/null
+++ b/meta-romulus/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend
@@ -0,0 +1 @@
+FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${BPN}:"
diff --git a/meta-romulus/recipes-phosphor/fans/phosphor-fan-monitor-config-native/monitor.yaml b/meta-romulus/recipes-phosphor/fans/phosphor-fan-monitor-config/monitor.yaml
similarity index 100%
rename from meta-romulus/recipes-phosphor/fans/phosphor-fan-monitor-config-native/monitor.yaml
rename to meta-romulus/recipes-phosphor/fans/phosphor-fan-monitor-config/monitor.yaml
diff --git a/meta-romulus/recipes-phosphor/fans/phosphor-fan-presence-config-native.bbappend b/meta-romulus/recipes-phosphor/fans/phosphor-fan-presence-config-native.bbappend
deleted file mode 100644
index 4db6f3a..0000000
--- a/meta-romulus/recipes-phosphor/fans/phosphor-fan-presence-config-native.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${PN}:"
diff --git a/meta-romulus/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend b/meta-romulus/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend
new file mode 100644
index 0000000..781af4f
--- /dev/null
+++ b/meta-romulus/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend
@@ -0,0 +1 @@
+FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${BPN}:"
diff --git a/meta-romulus/recipes-phosphor/fans/phosphor-fan-presence-config-native/config.yaml b/meta-romulus/recipes-phosphor/fans/phosphor-fan-presence-config/config.yaml
similarity index 100%
rename from meta-romulus/recipes-phosphor/fans/phosphor-fan-presence-config-native/config.yaml
rename to meta-romulus/recipes-phosphor/fans/phosphor-fan-presence-config/config.yaml
diff --git a/meta-romulus/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-romulus/recipes-phosphor/fans/phosphor-fan_%.bbappend
index 5c930a0..af5e1e6 100644
--- a/meta-romulus/recipes-phosphor/fans/phosphor-fan_%.bbappend
+++ b/meta-romulus/recipes-phosphor/fans/phosphor-fan_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${BPN}:"
 
 # Package configuration
 FAN_PACKAGES += " \