diff --git a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--peci-bus@100000/f0100000.peci-bus/peci-0/0-30/peci-cputemp.0.conf b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--peci-bus@100000/f0100000.peci-bus/peci-0/0-30/peci-cputemp.0.conf
new file mode 100644
index 0000000..b5324aa
--- /dev/null
+++ b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--peci-bus@100000/f0100000.peci-bus/peci-0/0-30/peci-cputemp.0.conf
@@ -0,0 +1,55 @@
+LABEL_temp1 = "cpu0_die_temp"
+WARNHI_temp1 = "79000"
+WARNLO_temp1 = "0"
+CRITHI_temp1 = "89000"
+CRITLO_temp1 = "0"
+MINVALUE_temp1 = "-128"
+MAXVALUE_temp1 = "127"
+
+LABEL_temp6 = "cpu0_core0_temp"
+WARNHI_temp6 = "79000"
+WARNLO_temp6 = "0"
+CRITHI_temp6 = "89000"
+CRITLO_temp6 = "0"
+MINVALUE_temp6 = "-128"
+MAXVALUE_temp6 = "127"
+
+LABEL_temp7 = "cpu0_core1_temp"
+WARNHI_temp7 = "79000"
+WARNLO_temp7 = "0"
+CRITHI_temp7 = "89000"
+CRITLO_temp7 = "0"
+MINVALUE_temp7 = "-128"
+MAXVALUE_temp7 = "127"
+
+LABEL_temp8 = "cpu0_core2_temp"
+WARNHI_temp8 = "79000"
+WARNLO_temp8 = "0"
+CRITHI_temp8 = "89000"
+CRITLO_temp8 = "0"
+MINVALUE_temp8 = "-128"
+MAXVALUE_temp8 = "127"
+
+LABEL_temp9 = "cpu0_core3_temp"
+WARNHI_temp9 = "79000"
+WARNLO_temp9 = "0"
+CRITHI_temp9 = "89000"
+CRITLO_temp9 = "0"
+MINVALUE_temp9 = "-128"
+MAXVALUE_temp9 = "127"
+
+LABEL_temp10 = "cpu0_core4_temp"
+WARNHI_temp10 = "79000"
+WARNLO_temp10 = "0"
+CRITHI_temp10 = "89000"
+CRITLO_temp10 = "0"
+MINVALUE_temp10 = "-128"
+MAXVALUE_temp10 = "127"
+
+LABEL_temp11 = "cpu0_core5_temp"
+WARNHI_temp11 = "79000"
+WARNLO_temp11 = "0"
+CRITHI_temp11 = "89000"
+CRITLO_temp11 = "0"
+MINVALUE_temp11 = "-128"
+MAXVALUE_temp11 = "127"
\ No newline at end of file
diff --git a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--peci-bus@100000/f0100000.peci-bus/peci-0/0-30/peci-dimmtemp.0.conf b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--peci-bus@100000/f0100000.peci-bus/peci-0/0-30/peci-dimmtemp.0.conf
new file mode 100644
index 0000000..c6bd4f7
--- /dev/null
+++ b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--peci-bus@100000/f0100000.peci-bus/peci-0/0-30/peci-dimmtemp.0.conf
@@ -0,0 +1,95 @@
+LABEL_temp1 = "dimm0_temp"
+WARNHI_temp1 = "79000"
+WARNLO_temp1 = "0"
+CRITHI_temp1 = "89000"
+CRITLO_temp1 = "0"
+MINVALUE_temp1 = "-128"
+MAXVALUE_temp1 = "127"
+
+LABEL_temp3 = "dimm2_temp"
+WARNHI_temp3 = "79000"
+WARNLO_temp3 = "0"
+CRITHI_temp3 = "89000"
+CRITLO_temp3 = "0"
+MINVALUE_temp3 = "-128"
+MAXVALUE_temp3 = "127"
+
+LABEL_temp5 = "dimm4_temp"
+WARNHI_temp5 = "79000"
+WARNLO_temp5 = "0"
+CRITHI_temp5 = "89000"
+CRITLO_temp5 = "0"
+MINVALUE_temp5 = "-128"
+MAXVALUE_temp5 = "127"
+
+LABEL_temp7 = "dimm6_temp"
+WARNHI_temp7 = "79000"
+WARNLO_temp7 = "0"
+CRITHI_temp7 = "89000"
+CRITLO_temp7 = "0"
+MINVALUE_temp7 = "-128"
+MAXVALUE_temp7 = "127"
+
+LABEL_temp9 = "dimm8_temp"
+WARNHI_temp9 = "79000"
+WARNLO_temp9 = "0"
+CRITHI_temp9 = "89000"
+CRITLO_temp9 = "0"
+MINVALUE_temp9 = "-128"
+MAXVALUE_temp9 = "127"
+
+LABEL_temp11 = "dimm10_temp"
+WARNHI_temp11 = "79000"
+WARNLO_temp11 = "0"
+CRITHI_temp11 = "89000"
+CRITLO_temp11 = "0"
+MINVALUE_temp11 = "-128"
+MAXVALUE_temp11 = "127"
+
+LABEL_temp2 = "dimm1_temp"
+WARNHI_temp2 = "79000"
+WARNLO_temp2 = "0"
+CRITHI_temp2 = "89000"
+CRITLO_temp2 = "0"
+MINVALUE_temp2 = "-128"
+MAXVALUE_temp2 = "127"
+
+LABEL_temp4 = "dimm3_temp"
+WARNHI_temp4 = "79000"
+WARNLO_temp4 = "0"
+CRITHI_temp4 = "89000"
+CRITLO_temp4 = "0"
+MINVALUE_temp4 = "-128"
+MAXVALUE_temp4 = "127"
+
+LABEL_temp6 = "dimm5_temp"
+WARNHI_temp6 = "79000"
+WARNLO_temp6 = "0"
+CRITHI_temp6 = "89000"
+CRITLO_temp6 = "0"
+MINVALUE_temp6 = "-128"
+MAXVALUE_temp6 = "127"
+
+LABEL_temp8 = "dimm7_temp"
+WARNHI_temp8 = "79000"
+WARNLO_temp8 = "0"
+CRITHI_temp8 = "89000"
+CRITLO_temp8 = "0"
+MINVALUE_temp8 = "-128"
+MAXVALUE_temp8 = "127"
+
+LABEL_temp10 = "dimm9_temp"
+WARNHI_temp10 = "79000"
+WARNLO_temp10 = "0"
+CRITHI_temp10 = "89000"
+CRITLO_temp10 = "0"
+MINVALUE_temp10 = "-128"
+MAXVALUE_temp10 = "127"
+
+LABEL_temp12 = "dimm11_temp"
+WARNHI_temp12 = "79000"
+WARNLO_temp12 = "0"
+CRITHI_temp12 = "89000"
+CRITLO_temp12 = "0"
+MINVALUE_temp12 = "-128"
+MAXVALUE_temp12 = "127"
diff --git a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--peci-bus@100000/f0100000.peci-bus/peci-0/0-31/peci-cputemp.1.conf b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--peci-bus@100000/f0100000.peci-bus/peci-0/0-31/peci-cputemp.1.conf
new file mode 100644
index 0000000..39e3259
--- /dev/null
+++ b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--peci-bus@100000/f0100000.peci-bus/peci-0/0-31/peci-cputemp.1.conf
@@ -0,0 +1,55 @@
+LABEL_temp1 = "cpu1_die_temp"
+WARNHI_temp1 = "79000"
+WARNLO_temp1 = "0"
+CRITHI_temp1 = "89000"
+CRITLO_temp1 = "0"
+MINVALUE_temp1 = "-128"
+MAXVALUE_temp1 = "127"
+
+LABEL_temp6 = "cpu1_core0_temp"
+WARNHI_temp6 = "79000"
+WARNLO_temp6 = "0"
+CRITHI_temp6 = "89000"
+CRITLO_temp6 = "0"
+MINVALUE_temp6 = "-128"
+MAXVALUE_temp6 = "127"
+
+LABEL_temp7 = "cpu1_core1_temp"
+WARNHI_temp7 = "79000"
+WARNLO_temp7 = "0"
+CRITHI_temp7 = "89000"
+CRITLO_temp7 = "0"
+MINVALUE_temp7 = "-128"
+MAXVALUE_temp7 = "127"
+
+LABEL_temp8 = "cpu1_core2_temp"
+WARNHI_temp8 = "79000"
+WARNLO_temp8 = "0"
+CRITHI_temp8 = "89000"
+CRITLO_temp8 = "0"
+MINVALUE_temp8 = "-128"
+MAXVALUE_temp8 = "127"
+
+LABEL_temp9 = "cpu1_core3_temp"
+WARNHI_temp9 = "79000"
+WARNLO_temp9 = "0"
+CRITHI_temp9 = "89000"
+CRITLO_temp9 = "0"
+MINVALUE_temp9 = "-128"
+MAXVALUE_temp9 = "127"
+
+LABEL_temp10 = "cpu1_core4_temp"
+WARNHI_temp10 = "79000"
+WARNLO_temp10 = "0"
+CRITHI_temp10 = "89000"
+CRITLO_temp10 = "0"
+MINVALUE_temp10 = "-128"
+MAXVALUE_temp10 = "127"
+
+LABEL_temp11 = "cpu1_core5_temp"
+WARNHI_temp11 = "79000"
+WARNLO_temp11 = "0"
+CRITHI_temp11 = "89000"
+CRITLO_temp11 = "0"
+MINVALUE_temp11 = "-128"
+MAXVALUE_temp11 = "127"
diff --git a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--peci-bus@100000/f0100000.peci-bus/peci-0/0-31/peci-dimmtemp.1.conf b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--peci-bus@100000/f0100000.peci-bus/peci-0/0-31/peci-dimmtemp.1.conf
new file mode 100644
index 0000000..8e55107
--- /dev/null
+++ b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--peci-bus@100000/f0100000.peci-bus/peci-0/0-31/peci-dimmtemp.1.conf
@@ -0,0 +1,95 @@
+LABEL_temp1 = "dimm12_temp"
+WARNHI_temp1 = "79000"
+WARNLO_temp1 = "0"
+CRITHI_temp1 = "89000"
+CRITLO_temp1 = "0"
+MINVALUE_temp1 = "-128"
+MAXVALUE_temp1 = "127"
+
+LABEL_temp3 = "dimm14_temp"
+WARNHI_temp3 = "79000"
+WARNLO_temp3 = "0"
+CRITHI_temp3 = "89000"
+CRITLO_temp3 = "0"
+MINVALUE_temp3 = "-128"
+MAXVALUE_temp3 = "127"
+
+LABEL_temp5 = "dimm16_temp"
+WARNHI_temp5 = "79000"
+WARNLO_temp5 = "0"
+CRITHI_temp5 = "89000"
+CRITLO_temp5 = "0"
+MINVALUE_temp5 = "-128"
+MAXVALUE_temp5 = "127"
+
+LABEL_temp7 = "dimm18_temp"
+WARNHI_temp7 = "79000"
+WARNLO_temp7 = "0"
+CRITHI_temp7 = "89000"
+CRITLO_temp7 = "0"
+MINVALUE_temp7 = "-128"
+MAXVALUE_temp7 = "127"
+
+LABEL_temp9 = "dimm20_temp"
+WARNHI_temp9 = "79000"
+WARNLO_temp9 = "0"
+CRITHI_temp9 = "89000"
+CRITLO_temp9 = "0"
+MINVALUE_temp9 = "-128"
+MAXVALUE_temp9 = "127"
+
+LABEL_temp11 = "dimm22_temp"
+WARNHI_temp11 = "79000"
+WARNLO_temp11 = "0"
+CRITHI_temp11 = "89000"
+CRITLO_temp11 = "0"
+MINVALUE_temp11 = "-128"
+MAXVALUE_temp11 = "127"
+
+LABEL_temp2 = "dimm13_temp"
+WARNHI_temp2 = "79000"
+WARNLO_temp2 = "0"
+CRITHI_temp2 = "89000"
+CRITLO_temp2 = "0"
+MINVALUE_temp2 = "-128"
+MAXVALUE_temp2 = "127"
+
+LABEL_temp4 = "dimm15_temp"
+WARNHI_temp4 = "79000"
+WARNLO_temp4 = "0"
+CRITHI_temp4 = "89000"
+CRITLO_temp4 = "0"
+MINVALUE_temp4 = "-128"
+MAXVALUE_temp4 = "127"
+
+LABEL_temp6 = "dimm17_temp"
+WARNHI_temp6 = "79000"
+WARNLO_temp6 = "0"
+CRITHI_temp6 = "89000"
+CRITLO_temp6 = "0"
+MINVALUE_temp6 = "-128"
+MAXVALUE_temp6 = "127"
+
+LABEL_temp8 = "dimm19_temp"
+WARNHI_temp8 = "79000"
+WARNLO_temp8 = "0"
+CRITHI_temp8 = "89000"
+CRITLO_temp8 = "0"
+MINVALUE_temp8 = "-128"
+MAXVALUE_temp8 = "127"
+
+LABEL_temp10 = "dimm21_temp"
+WARNHI_temp10 = "79000"
+WARNLO_temp10 = "0"
+CRITHI_temp10 = "89000"
+CRITLO_temp10 = "0"
+MINVALUE_temp10 = "-128"
+MAXVALUE_temp10 = "127"
+
+LABEL_temp12 = "dimm23_temp"
+WARNHI_temp12 = "79000"
+WARNLO_temp12 = "0"
+CRITHI_temp12 = "89000"
+CRITLO_temp12 = "0"
+MINVALUE_temp12 = "-128"
+MAXVALUE_temp12 = "127"
diff --git a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/ahb/ahb--apb/f0100000.peci-bus/peci-0/0-30/peci-cputemp.0.conf b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/ahb/ahb--apb/f0100000.peci-bus/peci-0/0-30/peci-cputemp.0.conf
deleted file mode 100644
index 3285f71..0000000
--- a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/ahb/ahb--apb/f0100000.peci-bus/peci-0/0-30/peci-cputemp.0.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-LABEL_temp1 = "Die_CPU0"
-WARNHI_temp1 = "79000"
-WARNLO_temp1 = "0"
-CRITHI_temp1 = "89000"
-CRITLO_temp1 = "0"
-LABEL_temp5 = "Core_0_CPU0"
-WARNHI_temp5 = "79000"
-WARNLO_temp5 = "0"
-CRITHI_temp5 = "89000"
-CRITLO_temp5 = "0"
-LABEL_temp6 = "Core_1_CPU0"
-WARNHI_temp6 = "79000"
-WARNLO_temp6 = "0"
-CRITHI_temp6 = "89000"
-CRITLO_temp6 = "0"
-LABEL_temp7 = "Core_2_CPU0"
-WARNHI_temp7 = "79000"
-WARNLO_temp7 = "0"
-CRITHI_temp7 = "89000"
-CRITLO_temp7 = "0"
-LABEL_temp8 = "Core_3_CPU0"
-WARNHI_temp8 = "79000"
-WARNLO_temp8 = "0"
-CRITHI_temp8 = "89000"
-CRITLO_temp8 = "0"
-LABEL_temp9 = "Core_4_CPU0"
-WARNHI_temp9 = "79000"
-WARNLO_temp9 = "0"
-CRITHI_temp9 = "89000"
-CRITLO_temp9 = "0"
-LABEL_temp10 = "Core_5_CPU0"
-WARNHI_temp10 = "79000"
-WARNLO_temp10 = "0"
-CRITHI_temp10 = "89000"
-CRITLO_temp10 = "0"
diff --git a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/ahb/ahb--apb/f0100000.peci-bus/peci-0/0-30/peci-dimmtemp.0.conf b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/ahb/ahb--apb/f0100000.peci-bus/peci-0/0-30/peci-dimmtemp.0.conf
deleted file mode 100644
index 7c74dd7..0000000
--- a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/ahb/ahb--apb/f0100000.peci-bus/peci-0/0-30/peci-dimmtemp.0.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-LABEL_temp5 = "DIMM_C1_CPU0"
-WARNHI_temp5 = "79000"
-WARNLO_temp5 = "0"
-CRITHI_temp5 = "89000"
-CRITLO_temp5 = "0"
diff --git a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/ahb/ahb--apb/f0100000.peci-bus/peci-0/0-31/peci-cputemp.1.conf b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/ahb/ahb--apb/f0100000.peci-bus/peci-0/0-31/peci-cputemp.1.conf
deleted file mode 100644
index a24fd0a..0000000
--- a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/ahb/ahb--apb/f0100000.peci-bus/peci-0/0-31/peci-cputemp.1.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-LABEL_temp1 = "Die_CPU1"
-WARNHI_temp1 = "79000"
-WARNLO_temp1 = "0"
-CRITHI_temp1 = "89000"
-CRITLO_temp1 = "0"
-LABEL_temp5 = "Core_0_CPU1"
-WARNHI_temp5 = "79000"
-WARNLO_temp5 = "0"
-CRITHI_temp5 = "89000"
-CRITLO_temp5 = "0"
-LABEL_temp6 = "Core_1_CPU1"
-WARNHI_temp6 = "79000"
-WARNLO_temp6 = "0"
-CRITHI_temp6 = "89000"
-CRITLO_temp6 = "0"
-LABEL_temp7 = "Core_2_CPU1"
-WARNHI_temp7 = "79000"
-WARNLO_temp7 = "0"
-CRITHI_temp7 = "89000"
-CRITLO_temp7 = "0"
-LABEL_temp8 = "Core_3_CPU1"
-WARNHI_temp8 = "79000"
-WARNLO_temp8 = "0"
-CRITHI_temp8 = "89000"
-CRITLO_temp8 = "0"
-LABEL_temp9 = "Core_4_CPU1"
-WARNHI_temp9 = "79000"
-WARNLO_temp9 = "0"
-CRITHI_temp9 = "89000"
-CRITLO_temp9 = "0"
-LABEL_temp10 = "Core_5_CPU1"
-WARNHI_temp10 = "79000"
-WARNLO_temp10 = "0"
-CRITHI_temp10 = "89000"
-CRITLO_temp10 = "0"