diff --git a/meta-olympus-nuvoton/recipes-phosphor/configuration/olympus-nuvoton-yaml-config/olympus-nuvoton-ipmi-fru-properties.yaml b/meta-olympus-nuvoton/recipes-phosphor/configuration/olympus-nuvoton-yaml-config/olympus-nuvoton-ipmi-fru-properties.yaml
index b15ed5f..e1aef0d 100644
--- a/meta-olympus-nuvoton/recipes-phosphor/configuration/olympus-nuvoton-yaml-config/olympus-nuvoton-ipmi-fru-properties.yaml
+++ b/meta-olympus-nuvoton/recipes-phosphor/configuration/olympus-nuvoton-yaml-config/olympus-nuvoton-ipmi-fru-properties.yaml
@@ -44,7 +44,7 @@
         Present: 'true'
     xyz.openbmc_project.State.Decorator.OperationalStatus:
         Functional: 'true'
-/system/chassis/motherboard/dimm_a0:
+/system/chassis/motherboard/dimm0:
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
@@ -53,7 +53,7 @@
         Present: 'true'
     xyz.openbmc_project.State.Decorator.OperationalStatus:
         Functional: 'true'
-/system/chassis/motherboard/dimm_a1:
+/system/chassis/motherboard/dimm1:
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
@@ -62,7 +62,7 @@
         Present: 'true'
     xyz.openbmc_project.State.Decorator.OperationalStatus:
         Functional: 'true'
-/system/chassis/motherboard/dimm_a2:
+/system/chassis/motherboard/dimm2:
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
@@ -71,7 +71,7 @@
         Present: 'true'
     xyz.openbmc_project.State.Decorator.OperationalStatus:
         Functional: 'true'
-/system/chassis/motherboard/dimm_a3:
+/system/chassis/motherboard/dimm3:
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
@@ -80,7 +80,7 @@
         Present: 'true'
     xyz.openbmc_project.State.Decorator.OperationalStatus:
         Functional: 'true'
-/system/chassis/motherboard/dimm_a4:
+/system/chassis/motherboard/dimm4:
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
@@ -89,7 +89,7 @@
         Present: 'true'
     xyz.openbmc_project.State.Decorator.OperationalStatus:
         Functional: 'true'
-/system/chassis/motherboard/dimm_a5:
+/system/chassis/motherboard/dimm5:
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
@@ -98,7 +98,7 @@
         Present: 'true'
     xyz.openbmc_project.State.Decorator.OperationalStatus:
         Functional: 'true'
-/system/chassis/motherboard/dimm_b0:
+/system/chassis/motherboard/dimm6:
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
@@ -107,7 +107,7 @@
         Present: 'true'
     xyz.openbmc_project.State.Decorator.OperationalStatus:
         Functional: 'true'
-/system/chassis/motherboard/dimm_b1:
+/system/chassis/motherboard/dimm7:
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
@@ -116,7 +116,7 @@
         Present: 'true'
     xyz.openbmc_project.State.Decorator.OperationalStatus:
         Functional: 'true'
-/system/chassis/motherboard/dimm_b2:
+/system/chassis/motherboard/dimm8:
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
@@ -125,7 +125,7 @@
         Present: 'true'
     xyz.openbmc_project.State.Decorator.OperationalStatus:
         Functional: 'true'
-/system/chassis/motherboard/dimm_b3:
+/system/chassis/motherboard/dimm9:
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
@@ -134,7 +134,7 @@
         Present: 'true'
     xyz.openbmc_project.State.Decorator.OperationalStatus:
         Functional: 'true'
-/system/chassis/motherboard/dimm_b4:
+/system/chassis/motherboard/dimm10:
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
@@ -143,7 +143,7 @@
         Present: 'true'
     xyz.openbmc_project.State.Decorator.OperationalStatus:
         Functional: 'true'
-/system/chassis/motherboard/dimm_b5:
+/system/chassis/motherboard/dimm11:
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
@@ -152,7 +152,7 @@
         Present: 'true'
     xyz.openbmc_project.State.Decorator.OperationalStatus:
         Functional: 'true'
-/system/chassis/motherboard/dimm_c0:
+/system/chassis/motherboard/dimm12:
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
@@ -161,7 +161,7 @@
         Present: 'true'
     xyz.openbmc_project.State.Decorator.OperationalStatus:
         Functional: 'true'
-/system/chassis/motherboard/dimm_c1:
+/system/chassis/motherboard/dimm13:
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
@@ -170,7 +170,7 @@
         Present: 'true'
     xyz.openbmc_project.State.Decorator.OperationalStatus:
         Functional: 'true'
-/system/chassis/motherboard/dimm_c2:
+/system/chassis/motherboard/dimm14:
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
@@ -179,7 +179,7 @@
         Present: 'true'
     xyz.openbmc_project.State.Decorator.OperationalStatus:
         Functional: 'true'
-/system/chassis/motherboard/dimm_c3:
+/system/chassis/motherboard/dimm15:
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
@@ -188,7 +188,7 @@
         Present: 'true'
     xyz.openbmc_project.State.Decorator.OperationalStatus:
         Functional: 'true'
-/system/chassis/motherboard/dimm_c4:
+/system/chassis/motherboard/dimm16:
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
@@ -197,7 +197,7 @@
         Present: 'true'
     xyz.openbmc_project.State.Decorator.OperationalStatus:
         Functional: 'true'
-/system/chassis/motherboard/dimm_c5:
+/system/chassis/motherboard/dimm17:
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
@@ -206,7 +206,7 @@
         Present: 'true'
     xyz.openbmc_project.State.Decorator.OperationalStatus:
         Functional: 'true'
-/system/chassis/motherboard/dimm_d0:
+/system/chassis/motherboard/dimm18:
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
@@ -215,7 +215,7 @@
         Present: 'true'
     xyz.openbmc_project.State.Decorator.OperationalStatus:
         Functional: 'true'
-/system/chassis/motherboard/dimm_d1:
+/system/chassis/motherboard/dimm19:
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
@@ -224,7 +224,7 @@
         Present: 'true'
     xyz.openbmc_project.State.Decorator.OperationalStatus:
         Functional: 'true'
-/system/chassis/motherboard/dimm_d2:
+/system/chassis/motherboard/dimm20:
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
@@ -233,7 +233,7 @@
         Present: 'true'
     xyz.openbmc_project.State.Decorator.OperationalStatus:
         Functional: 'true'
-/system/chassis/motherboard/dimm_d3:
+/system/chassis/motherboard/dimm21:
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
@@ -242,7 +242,7 @@
         Present: 'true'
     xyz.openbmc_project.State.Decorator.OperationalStatus:
         Functional: 'true'
-/system/chassis/motherboard/dimm_d4:
+/system/chassis/motherboard/dimm22:
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
@@ -251,7 +251,7 @@
         Present: 'true'
     xyz.openbmc_project.State.Decorator.OperationalStatus:
         Functional: 'true'
-/system/chassis/motherboard/dimm_d5:
+/system/chassis/motherboard/dimm23:
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
diff --git a/meta-olympus-nuvoton/recipes-phosphor/configuration/olympus-nuvoton-yaml-config/olympus-nuvoton-ipmi-fru.yaml b/meta-olympus-nuvoton/recipes-phosphor/configuration/olympus-nuvoton-yaml-config/olympus-nuvoton-ipmi-fru.yaml
index 70bfbe2..14d6a2b 100644
--- a/meta-olympus-nuvoton/recipes-phosphor/configuration/olympus-nuvoton-yaml-config/olympus-nuvoton-ipmi-fru.yaml
+++ b/meta-olympus-nuvoton/recipes-phosphor/configuration/olympus-nuvoton-yaml-config/olympus-nuvoton-ipmi-fru.yaml
@@ -128,7 +128,7 @@
           IPMIFruSection: Board
       xyz.openbmc_project.Inventory.Item.Cpu:
 5:
-  /system/chassis/motherboard/dimm_a0:
+  /system/chassis/motherboard/dimm0:
     entityID: 8
     entityInstance: 1
     interfaces:
@@ -148,7 +148,7 @@
           IPMIFruSection: Product
       xyz.openbmc_project.Inventory.Item.Dimm:
 6:
-  /system/chassis/motherboard/dimm_a1:
+  /system/chassis/motherboard/dimm1:
     entityID: 8
     entityInstance: 2
     interfaces:
@@ -168,7 +168,7 @@
           IPMIFruSection: Product
       xyz.openbmc_project.Inventory.Item.Dimm:
 7:
-  /system/chassis/motherboard/dimm_a2:
+  /system/chassis/motherboard/dimm2:
     entityID: 8
     entityInstance: 3
     interfaces:
@@ -188,7 +188,7 @@
           IPMIFruSection: Product
       xyz.openbmc_project.Inventory.Item.Dimm:
 8:
-  /system/chassis/motherboard/dimm_a3:
+  /system/chassis/motherboard/dimm3:
     entityID: 8
     entityInstance: 4
     interfaces:
@@ -208,7 +208,7 @@
           IPMIFruSection: Product
       xyz.openbmc_project.Inventory.Item.Dimm:
 9:
-  /system/chassis/motherboard/dimm_a4:
+  /system/chassis/motherboard/dimm4:
     entityID: 8
     entityInstance: 5
     interfaces:
@@ -228,7 +228,7 @@
           IPMIFruSection: Product
       xyz.openbmc_project.Inventory.Item.Dimm:
 10:
-  /system/chassis/motherboard/dimm_a5:
+  /system/chassis/motherboard/dimm5:
     entityID: 8
     entityInstance: 6
     interfaces:
@@ -248,7 +248,7 @@
           IPMIFruSection: Product
       xyz.openbmc_project.Inventory.Item.Dimm:
 11:
-  /system/chassis/motherboard/dimm_b0:
+  /system/chassis/motherboard/dimm6:
     entityID: 8
     entityInstance: 7
     interfaces:
@@ -268,7 +268,7 @@
           IPMIFruSection: Product
       xyz.openbmc_project.Inventory.Item.Dimm:
 12:
-  /system/chassis/motherboard/dimm_b1:
+  /system/chassis/motherboard/dimm7:
     entityID: 8
     entityInstance: 8
     interfaces:
@@ -288,7 +288,7 @@
           IPMIFruSection: Product
       xyz.openbmc_project.Inventory.Item.Dimm:
 13:
-  /system/chassis/motherboard/dimm_b2:
+  /system/chassis/motherboard/dimm8:
     entityID: 8
     entityInstance: 9
     interfaces:
@@ -308,7 +308,7 @@
           IPMIFruSection: Product
       xyz.openbmc_project.Inventory.Item.Dimm:
 14:
-  /system/chassis/motherboard/dimm_b3:
+  /system/chassis/motherboard/dimm9:
     entityID: 8
     entityInstance: 10
     interfaces:
@@ -328,7 +328,7 @@
           IPMIFruSection: Product
       xyz.openbmc_project.Inventory.Item.Dimm:
 15:
-  /system/chassis/motherboard/dimm_b4:
+  /system/chassis/motherboard/dimm10:
     entityID: 8
     entityInstance: 11
     interfaces:
@@ -348,7 +348,7 @@
           IPMIFruSection: Product
       xyz.openbmc_project.Inventory.Item.Dimm:
 16:
-  /system/chassis/motherboard/dimm_b5:
+  /system/chassis/motherboard/dimm11:
     entityID: 8
     entityInstance: 12
     interfaces:
@@ -368,7 +368,7 @@
           IPMIFruSection: Product
       xyz.openbmc_project.Inventory.Item.Dimm:
 17:
-  /system/chassis/motherboard/dimm_c0:
+  /system/chassis/motherboard/dimm12:
     entityID: 8
     entityInstance: 13
     interfaces:
@@ -388,7 +388,7 @@
           IPMIFruSection: Product
       xyz.openbmc_project.Inventory.Item.Dimm:
 18:
-  /system/chassis/motherboard/dimm_c1:
+  /system/chassis/motherboard/dimm13:
     entityID: 8
     entityInstance: 14
     interfaces:
@@ -408,7 +408,7 @@
           IPMIFruSection: Product
       xyz.openbmc_project.Inventory.Item.Dimm:
 19:
-  /system/chassis/motherboard/dimm_c2:
+  /system/chassis/motherboard/dimm14:
     entityID: 8
     entityInstance: 15
     interfaces:
@@ -428,7 +428,7 @@
           IPMIFruSection: Product
       xyz.openbmc_project.Inventory.Item.Dimm:
 20:
-  /system/chassis/motherboard/dimm_c3:
+  /system/chassis/motherboard/dimm15:
     entityID: 8
     entityInstance: 16
     interfaces:
@@ -448,7 +448,7 @@
           IPMIFruSection: Product
       xyz.openbmc_project.Inventory.Item.Dimm:
 21:
-  /system/chassis/motherboard/dimm_c4:
+  /system/chassis/motherboard/dimm16:
     entityID: 8
     entityInstance: 17
     interfaces:
@@ -468,7 +468,7 @@
           IPMIFruSection: Product
       xyz.openbmc_project.Inventory.Item.Dimm:
 22:
-  /system/chassis/motherboard/dimm_c5:
+  /system/chassis/motherboard/dimm17:
     entityID: 8
     entityInstance: 18
     interfaces:
@@ -488,7 +488,7 @@
           IPMIFruSection: Product
       xyz.openbmc_project.Inventory.Item.Dimm:
 23:
-  /system/chassis/motherboard/dimm_d0:
+  /system/chassis/motherboard/dimm18:
     entityID: 8
     entityInstance: 19
     interfaces:
@@ -508,7 +508,7 @@
           IPMIFruSection: Product
       xyz.openbmc_project.Inventory.Item.Dimm:
 24:
-  /system/chassis/motherboard/dimm_d1:
+  /system/chassis/motherboard/dimm19:
     entityID: 8
     entityInstance: 20
     interfaces:
@@ -528,7 +528,7 @@
           IPMIFruSection: Product
       xyz.openbmc_project.Inventory.Item.Dimm:
 25:
-  /system/chassis/motherboard/dimm_d2:
+  /system/chassis/motherboard/dimm20:
     entityID: 8
     entityInstance: 21
     interfaces:
@@ -548,7 +548,7 @@
           IPMIFruSection: Product
       xyz.openbmc_project.Inventory.Item.Dimm:
 26:
-  /system/chassis/motherboard/dimm_d3:
+  /system/chassis/motherboard/dimm21:
     entityID: 8
     entityInstance: 22
     interfaces:
@@ -568,7 +568,7 @@
           IPMIFruSection: Product
       xyz.openbmc_project.Inventory.Item.Dimm:
 27:
-  /system/chassis/motherboard/dimm_d4:
+  /system/chassis/motherboard/dimm22:
     entityID: 8
     entityInstance: 23
     interfaces:
@@ -588,7 +588,7 @@
           IPMIFruSection: Product
       xyz.openbmc_project.Inventory.Item.Dimm:
 28:
-  /system/chassis/motherboard/dimm_d5:
+  /system/chassis/motherboard/dimm23:
     entityID: 8
     entityInstance: 24
     interfaces:
diff --git a/meta-olympus-nuvoton/recipes-phosphor/configuration/olympus-nuvoton-yaml-config/olympus-nuvoton-ipmi-sensors.yaml b/meta-olympus-nuvoton/recipes-phosphor/configuration/olympus-nuvoton-yaml-config/olympus-nuvoton-ipmi-sensors.yaml
index 0635a8f..4ba4ebd 100644
--- a/meta-olympus-nuvoton/recipes-phosphor/configuration/olympus-nuvoton-yaml-config/olympus-nuvoton-ipmi-sensors.yaml
+++ b/meta-olympus-nuvoton/recipes-phosphor/configuration/olympus-nuvoton-yaml-config/olympus-nuvoton-ipmi-sensors.yaml
@@ -1,3 +1,11 @@
+# y = L[(M*x + (B * 10^K1)) * 10^K2]units
+# x: raw value
+# y: real value
+# M: multiplierM
+# B: offsetB
+# K1: bExp
+# K2: rExp
+
 1: &temperature
   entityID: 0x07
   entityInstance: 1
@@ -33,35 +41,53 @@
 4:
   <<: *temperature
   entityInstance: 4
-  path: /xyz/openbmc_project/sensors/temperature/MB0_Temp
+  path: /xyz/openbmc_project/sensors/temperature/p0_vccin_vr_temp
 
 5:
   <<: *temperature
   entityInstance: 5
-  path: /xyz/openbmc_project/sensors/temperature/p0_vccin_vr_temp
+  path: /xyz/openbmc_project/sensors/temperature/p0_vccio_vr_temp
+
 6:
   <<: *temperature
   entityInstance: 6
-  path: /xyz/openbmc_project/sensors/temperature/p0_vccio_vr_temp
+  path: /xyz/openbmc_project/sensors/temperature/p1_vccin_vr_temp
+
 7:
   <<: *temperature
   entityInstance: 7
-  path: /xyz/openbmc_project/sensors/temperature/p1_vccin_vr_temp
+  path: /xyz/openbmc_project/sensors/temperature/p1_vccio_vr_temp
+
 8:
   <<: *temperature
   entityInstance: 8
-  path: /xyz/openbmc_project/sensors/temperature/p1_vccio_vr_temp
+  path: /xyz/openbmc_project/sensors/temperature/p0_dimm_vr0_temp
 
-9: &voltage
-  entityID: 0x07
+9:
+  <<: *temperature
   entityInstance: 9
+  path: /xyz/openbmc_project/sensors/temperature/p0_dimm_vr1_temp
+
+10:
+  <<: *temperature
+  entityInstance: 10
+  path: /xyz/openbmc_project/sensors/temperature/p1_dimm_vr0_temp
+
+11:
+  <<: *temperature
+  entityInstance: 11
+  path: /xyz/openbmc_project/sensors/temperature/p1_dimm_vr1_temp
+
+12: &voltage
+  entityID: 0x07
+  entityInstance: 12
   sensorType: 0x02
-  path: /xyz/openbmc_project/sensors/voltage/MB0_Vin
+  path: /xyz/openbmc_project/sensors/voltage/p0_vccin_vr_voltage
   sensorReadingType: 0x01
-  multiplierM: 8
+  multiplierM: 51
   offsetB: 0
   bExp: 0
-  rExp: -2
+  rExp: -3
   mutability: Mutability::Write|Mutability::Read
   serviceInterface: org.freedesktop.DBus.Properties
   readingType: readingData
@@ -74,73 +100,103 @@
           0xFF:
             type: double
 
-10:
-  <<: *voltage
-  entityInstance: 10
-  path: /xyz/openbmc_project/sensors/voltage/MB0_Vout
-
-11:
-  <<: *voltage
-  entityInstance: 11
-  path: /xyz/openbmc_project/sensors/voltage/p0_vccin_vr_voltage
-
-12:
-  <<: *voltage
-  entityInstance: 12
-  path: /xyz/openbmc_project/sensors/voltage/p0_vccio_vr_voltage
-
 13:
   <<: *voltage
   entityInstance: 13
-  path: /xyz/openbmc_project/sensors/voltage/p1_vccin_vr_voltage
+  path: /xyz/openbmc_project/sensors/voltage/p0_vccio_vr_voltage
 
 14:
   <<: *voltage
   entityInstance: 14
-  path: /xyz/openbmc_project/sensors/voltage/p1_vccio_vr_voltage
+  path: /xyz/openbmc_project/sensors/voltage/p1_vccin_vr_voltage
 
 15:
   <<: *voltage
   entityInstance: 15
-  path: /xyz/openbmc_project/sensors/voltage/P12V_STBY
+  path: /xyz/openbmc_project/sensors/voltage/p1_vccio_vr_voltage
 
 16:
   <<: *voltage
   entityInstance: 16
-  path: /xyz/openbmc_project/sensors/voltage/P1V05_STBY_PCH
+  path: /xyz/openbmc_project/sensors/voltage/p0_dimm_vr0_voltage
 
 17:
   <<: *voltage
   entityInstance: 17
-  path: /xyz/openbmc_project/sensors/voltage/P3V3
+  path: /xyz/openbmc_project/sensors/voltage/p0_dimm_vr1_voltage
 
 18:
   <<: *voltage
   entityInstance: 18
-  path: /xyz/openbmc_project/sensors/voltage/P3V3_STBY
+  path: /xyz/openbmc_project/sensors/voltage/p1_dimm_vr0_voltage
 
 19:
   <<: *voltage
   entityInstance: 19
-  path: /xyz/openbmc_project/sensors/voltage/P3V_BAT
+  path: /xyz/openbmc_project/sensors/voltage/p1_dimm_vr1_voltage
+
 20:
   <<: *voltage
   entityInstance: 20
-  path: /xyz/openbmc_project/sensors/voltage/P5V
+  path: /xyz/openbmc_project/sensors/voltage/P12V_STBY
+  multiplierM: 55
+  rExp: -3
+
 21:
   <<: *voltage
   entityInstance: 21
-  path: /xyz/openbmc_project/sensors/voltage/P5V_STBY
+  path: /xyz/openbmc_project/sensors/voltage/P1V05_STBY_PCH
+  multiplierM: 78
+  rExp: -4
+  offsetB: 110
+
 22:
   <<: *voltage
   entityInstance: 22
-  path: /xyz/openbmc_project/sensors/voltage/PVNN_STBY_PCH
+  path: /xyz/openbmc_project/sensors/voltage/P3V3
+  multiplierM: 157
+  rExp: -4
 
-23: &power
-  entityID: 0x07
+23:
+  <<: *voltage
   entityInstance: 23
-  sensorType: 0x08
-  path: /xyz/openbmc_project/sensors/power/MB0_Pin
+  path: /xyz/openbmc_project/sensors/voltage/P3V3_STBY
+  multiplierM: 157
+  rExp: -4
+
+24:
+  <<: *voltage
+  entityInstance: 24
+  path: /xyz/openbmc_project/sensors/voltage/P3V_BAT
+  multiplierM: 157
+  rExp: -4
+
+25:
+  <<: *voltage
+  entityInstance: 25
+  path: /xyz/openbmc_project/sensors/voltage/P5V
+  multiplierM: 235
+  rExp: -4
+
+26:
+  <<: *voltage
+  entityInstance: 26
+  path: /xyz/openbmc_project/sensors/voltage/P5V_STBY
+  multiplierM: 235
+  rExp: -4
+
+27:
+  <<: *voltage
+  entityInstance: 27
+  path: /xyz/openbmc_project/sensors/voltage/PVNN_STBY_PCH
+  multiplierM: 78
+  rExp: -4
+
+28: &power
+  entityID: 0x07
+  entityInstance: 28
+  sensorType: 0x0B
+  path: /xyz/openbmc_project/sensors/power/p0_vccin_vr_pin
   sensorReadingType: 0x01
   multiplierM: 48
   offsetB: 0
@@ -157,217 +213,91 @@
         Offsets:
           0xFF:
             type: double
-24:
-  <<: *power
-  entityInstance: 24
-  path: /xyz/openbmc_project/sensors/power/p0_vccin_vr_pin
-25:
-  <<: *power
-  entityInstance: 25
-  path: /xyz/openbmc_project/sensors/power/p0_vccin_vr_pout
-26:
-  <<: *power
-  entityInstance: 26
-  path: /xyz/openbmc_project/sensors/power/p0_vccio_vr_pin
-27:
-  <<: *power
-  entityInstance: 27
-  path: /xyz/openbmc_project/sensors/power/p0_vccio_vr_pout
-28:
-  <<: *power
-  entityInstance: 28
-  path: /xyz/openbmc_project/sensors/power/p1_vccin_vr_pin
+
 29:
   <<: *power
   entityInstance: 29
-  path: /xyz/openbmc_project/sensors/power/p1_vccin_vr_pout
+  path: /xyz/openbmc_project/sensors/power/p0_vccin_vr_pout
+
 30:
   <<: *power
   entityInstance: 30
-  path: /xyz/openbmc_project/sensors/power/p1_vccio_vr_pin
+  path: /xyz/openbmc_project/sensors/power/p0_vccio_vr_pin
+
 31:
   <<: *power
   entityInstance: 31
-  path: /xyz/openbmc_project/sensors/power/p1_vccio_vr_pout
+  path: /xyz/openbmc_project/sensors/power/p0_vccio_vr_pout
 
-32: &current
-  entityID: 0x07
+32:
+  <<: *power
   entityInstance: 32
-  sensorType: 0x03
-  path: /xyz/openbmc_project/sensors/current/MB0_Iout
-  sensorReadingType: 0x01
-  multiplierM: 40
-  offsetB: 10
-  bExp: 0
-  rExp: -3
-  mutability: Mutability::Write|Mutability::Read
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  sensorNamePattern: nameLeaf
-  unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0xFF:
-            type: double
+  path: /xyz/openbmc_project/sensors/power/p1_vccin_vr_pin
 
 33:
-  <<: *current
+  <<: *power
   entityInstance: 33
-  path: /xyz/openbmc_project/sensors/current/p0_vccin_vr_current
+  path: /xyz/openbmc_project/sensors/power/p1_vccin_vr_pout
+
 34:
-  <<: *current
+  <<: *power
   entityInstance: 34
-  path: /xyz/openbmc_project/sensors/current/p0_vccio_vr_current
+  path: /xyz/openbmc_project/sensors/power/p1_vccio_vr_pin
+
 35:
-  <<: *current
+  <<: *power
   entityInstance: 35
-  path: /xyz/openbmc_project/sensors/current/p1_vccin_vr_current
+  path: /xyz/openbmc_project/sensors/power/p1_vccio_vr_pout
+
 36:
-  <<: *current
+  <<: *power
   entityInstance: 36
-  path: /xyz/openbmc_project/sensors/current/p1_vccio_vr_current
-
-37: &temperature_dimm
-  entityID: 0x20
-  entityInstance: 1
-  sensorType: 0x01
-  path: /xyz/openbmc_project/sensors/temperature/p0_dimm_vr0_temp
-  sensorReadingType: 0x01
-  multiplierM: 1
-  offsetB: 0
-  bExp: 0
-  rExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-  mutability: Mutability::Write|Mutability::Read
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  sensorNamePattern: nameLeaf
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0xFF:
-            type: double
-
-38:
-  <<: *temperature_dimm
-  entityInstance: 2
-  path: /xyz/openbmc_project/sensors/temperature/p0_dimm_vr1_temp
-
-39:
-  <<: *temperature_dimm
-  entityInstance: 3
-  path: /xyz/openbmc_project/sensors/temperature/p1_dimm_vr0_temp
-
-40:
-  <<: *temperature_dimm
-  entityInstance: 4
-  path: /xyz/openbmc_project/sensors/temperature/p1_dimm_vr1_temp
-
-41: &voltage_dimm
-  entityID: 0x20
-  entityInstance: 5
-  sensorType: 0x02
-  path: /xyz/openbmc_project/sensors/voltage/p0_dimm_vr0_voltage
-  sensorReadingType: 0x01
-  multiplierM: 8
-  offsetB: 0
-  bExp: 0
-  rExp: -2
-  mutability: Mutability::Write|Mutability::Read
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  sensorNamePattern: nameLeaf
-  unit: xyz.openbmc_project.Sensor.Value.Unit.Volts
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0xFF:
-            type: double
-42:
-  <<: *voltage_dimm
-  entityInstance: 6
-  path: /xyz/openbmc_project/sensors/voltage/p0_dimm_vr1_voltage
-
-43:
-  <<: *voltage_dimm
-  entityInstance: 7
-  path: /xyz/openbmc_project/sensors/voltage/p1_dimm_vr0_voltage
-
-44:
-  <<: *voltage_dimm
-  entityInstance: 8
-  path: /xyz/openbmc_project/sensors/voltage/p1_dimm_vr1_voltage
-
-45: &power_dimm
-  entityID: 0x20
-  entityInstance: 9
-  sensorType: 0x08
   path: /xyz/openbmc_project/sensors/power/p0_dimm_vr0_pin
-  sensorReadingType: 0x01
-  multiplierM: 48
-  offsetB: 0
-  bExp: 0
-  rExp: -3
-  mutability: Mutability::Write|Mutability::Read
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  sensorNamePattern: nameLeaf
-  unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0xFF:
-            type: double
-46:
-  <<: *power_dimm
-  entityInstance: 10
+
+37:
+  <<: *power
+  entityInstance: 37
   path: /xyz/openbmc_project/sensors/power/p0_dimm_vr0_pout
 
-47:
-  <<: *power_dimm
-  entityInstance: 11
+38:
+  <<: *power
+  entityInstance: 38
   path: /xyz/openbmc_project/sensors/power/p0_dimm_vr1_pin
 
-48:
-  <<: *power_dimm
-  entityInstance: 12
+39:
+  <<: *power
+  entityInstance: 39
   path: /xyz/openbmc_project/sensors/power/p0_dimm_vr1_pout
 
-49:
-  <<: *power_dimm
-  entityInstance: 13
+40:
+  <<: *power
+  entityInstance: 40
   path: /xyz/openbmc_project/sensors/power/p1_dimm_vr0_pin
 
-50:
-  <<: *power_dimm
-  entityInstance: 14
+41:
+  <<: *power
+  entityInstance: 41
   path: /xyz/openbmc_project/sensors/power/p1_dimm_vr0_pout
 
-51:
-  <<: *power_dimm
-  entityInstance: 15
+42:
+  <<: *power
+  entityInstance: 42
   path: /xyz/openbmc_project/sensors/power/p1_dimm_vr1_pin
 
-52:
-  <<: *power_dimm
-  entityInstance: 16
+43:
+  <<: *power
+  entityInstance: 43
   path: /xyz/openbmc_project/sensors/power/p1_dimm_vr1_pout
 
-53: &current_dimm
-  entityID: 0x20
-  entityInstance: 17
+44: &current
+  entityID: 0x07
+  entityInstance: 44
   sensorType: 0x03
-  path: /xyz/openbmc_project/sensors/current/p0_dimm_vr0_current
+  path: /xyz/openbmc_project/sensors/current/p0_vccio_vr_current
   sensorReadingType: 0x01
-  multiplierM: 40
-  offsetB: 10
-  bExp: 0
-  rExp: -3
+  multiplierM: 117
+  offsetB: 0
+  rExp: -2
   mutability: Mutability::Write|Mutability::Read
   serviceInterface: org.freedesktop.DBus.Properties
   readingType: readingData
@@ -379,117 +309,81 @@
         Offsets:
           0xFF:
             type: double
-54:
-  <<: *current_dimm
-  entityInstance: 18
-  path: /xyz/openbmc_project/sensors/current/p0_dimm_vr0_lin
 
-55:
-  <<: *current_dimm
-  entityInstance: 19
-  path: /xyz/openbmc_project/sensors/current/p0_dimm_vr1_current
+45:
+  <<: *current
+  entityInstance: 45
+  path: /xyz/openbmc_project/sensors/current/p1_vccio_vr_current
 
-56:
-  <<: *current_dimm
-  entityInstance: 20
-  path: /xyz/openbmc_project/sensors/current/p0_dimm_vr1_lin
-
-57:
-  <<: *current_dimm
-  entityInstance: 21
-  path: /xyz/openbmc_project/sensors/current/p1_dimm_vr0_current
-
-58:
-  <<: *current_dimm
-  entityInstance: 22
-  path: /xyz/openbmc_project/sensors/current/p1_dimm_vr0_lin
-
-59:
-  <<: *current_dimm
-  entityInstance: 23
-  path: /xyz/openbmc_project/sensors/current/p1_dimm_vr1_current
-
-60:
-  <<: *current_dimm
-  entityInstance: 24
-  path: /xyz/openbmc_project/sensors/current/p1_dimm_vr1_lin
-
-61:
-  entityID: 0x13
-  entityInstance: 1
-  sensorType: 0x01
-  path: /xyz/openbmc_project/sensors/temperature/ps0_tempture
-  sensorReadingType: 0x01
-  multiplierM: 1
-  offsetB: 0
-  bExp: 0
-  rExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-  mutability: Mutability::Write|Mutability::Read
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  sensorNamePattern: nameLeaf
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0xFF:
-            type: double
-62:
-  <<: *voltage
-  entityID: 0x0A
-  entityInstance: 2
-  path: /xyz/openbmc_project/sensors/voltage/ps0_input_voltage
-  multiplierM: 2
-  offsetB: 0
-  bExp: 0
-  rExp: 0
-
-63:
-  <<: *voltage
-  entityID: 0x0A
-  entityInstance: 3
-  path: /xyz/openbmc_project/sensors/voltage/ps0_output_voltage
-  multiplierM: 8
-  offsetB: 0
-  bExp: 0
+46:
+  <<: *current
+  entityInstance: 46
+  path: /xyz/openbmc_project/sensors/current/p0_dimm_vr0_current
+  multiplierM: 30
   rExp: -2
 
-64:
+47:
   <<: *current
-  entityID: 0x0A
-  entityInstance: 4
-  path: /xyz/openbmc_project/sensors/current/ps0_input_current
-65:
+  entityInstance: 47
+  path: /xyz/openbmc_project/sensors/current/p0_dimm_vr1_current
+  multiplierM: 30
+  rExp: -2
+
+48:
   <<: *current
-  entityID: 0x0A
-  entityInstance: 5
-  path: /xyz/openbmc_project/sensors/current/ps0_output_current
-66:
-  <<: *power
-  entityID: 0x0A
-  entityInstance: 6
-  path: /xyz/openbmc_project/sensors/power/ps0_input_power
-  multiplierM: 6
-  offsetB: 0
-  bExp: 0
-  rExp: 0
-67:
-  <<: *power
-  entityID: 0x0A
-  entityInstance: 7
-  path: /xyz/openbmc_project/sensors/power/ps0_output_power
-  multiplierM: 6
-  offsetB: 0
-  bExp: 0
-  rExp: 0
-68: &fan_tach
-  entityID: 0x0A
-  entityInstance: 8
-  sensorType: 0x04
-  path: /xyz/openbmc_project/sensors/fan_tach/ps0_fan1
-  sensorReadingType: 0x01
+  entityInstance: 48
+  path: /xyz/openbmc_project/sensors/current/p1_dimm_vr0_current
+  multiplierM: 30
+  rExp: -2
+
+49:
+  <<: *current
+  entityInstance: 49
+  path: /xyz/openbmc_project/sensors/current/p1_dimm_vr1_current
+  multiplierM: 30
+  rExp: -2
+
+50:
+  <<: *current
+  entityInstance: 50
+  path: /xyz/openbmc_project/sensors/current/p0_vccin_vr_current
   multiplierM: 100
+  rExp: -2
+
+51:
+  <<: *current
+  entityInstance: 51
+  path: /xyz/openbmc_project/sensors/current/p1_vccin_vr_current
+  multiplierM: 100
+  rExp: -2
+
+52:
+  <<: *current
+  entityInstance: 52
+  path: /xyz/openbmc_project/sensors/current/p1_dimm_vr0_iin
+
+53:
+  <<: *current
+  entityInstance: 53
+  path: /xyz/openbmc_project/sensors/current/p1_dimm_vr1_iin
+
+54:
+  <<: *current
+  entityInstance: 54
+  path: /xyz/openbmc_project/sensors/current/p0_dimm_vr0_iin
+
+55:
+  <<: *current
+  entityInstance: 55
+  path: /xyz/openbmc_project/sensors/current/p0_dimm_vr1_iin
+
+56: &fan_tach
+  entityID: 0x1D
+  entityInstance: 1
+  sensorType: 0x04
+  path: /xyz/openbmc_project/sensors/fan_tach/fan1
+  sensorReadingType: 0x01
+  multiplierM: 79
   offsetB: 0
   bExp: 0
   rExp: 0
@@ -503,112 +397,473 @@
         Offsets:
           0xFF:
             type: double
-69:
-  <<: *fan_tach
-  entityID: 0x0A
-  entityInstance: 9
-  sensorType: 0x04
-  path: /xyz/openbmc_project/sensors/fan_tach/ps0_fan2
 
-70:
-  <<: *fan_tach
-  entityID: 0x1D
-  entityInstance: 1
-  path: /xyz/openbmc_project/sensors/fan_tach/fan1
-71:
+57:
   <<: *fan_tach
   entityID: 0x1D
   entityInstance: 2
   path: /xyz/openbmc_project/sensors/fan_tach/fan2
-72:
+58:
   <<: *fan_tach
   entityID: 0x1D
   entityInstance: 3
   path: /xyz/openbmc_project/sensors/fan_tach/fan3
-73:
+59:
   <<: *fan_tach
   entityID: 0x1D
   entityInstance: 4
   path: /xyz/openbmc_project/sensors/fan_tach/fan4
-74:
+60:
   <<: *fan_tach
   entityID: 0x1D
   entityInstance: 5
   path: /xyz/openbmc_project/sensors/fan_tach/fan5
-75:
+61:
   <<: *fan_tach
   entityID: 0x1D
   entityInstance: 6
   path: /xyz/openbmc_project/sensors/fan_tach/fan6
 
+62:
+  <<: *current
+  entityID: 0x0E
+  entityInstance: 1
+  path: /xyz/openbmc_project/sensors/current/hotswap_iout
+  multiplierM: 10
+  offsetB: 0
+  rExp: -2
+
+63:
+  <<: *voltage
+  entityID: 0x0E
+  entityInstance: 2
+  path: /xyz/openbmc_project/sensors/voltage/hotswap_vout
+
+64:
+  <<: *voltage
+  entityID: 0x0E
+  entityInstance: 3
+  path: /xyz/openbmc_project/sensors/voltage/hotswap_vin
+
+65:
+  <<: *power
+  entityID: 0x0E
+  entityInstance: 4
+  path: /xyz/openbmc_project/sensors/power/hotswap_pout
+  multiplierM: 5
+  offsetB: 0
+  rExp: -1
+
+66:
+  <<: *temperature
+  entityID: 0x0E
+  entityInstance: 5
+  path: /xyz/openbmc_project/sensors/temperature/hotswap_temp
+
+67:
+  <<: *temperature
+  entityID: 0x0A
+  entityInstance: 1
+  path: /xyz/openbmc_project/sensors/temperature/ps0_tempture
+
+68:
+  <<: *voltage
+  entityID: 0x0A
+  entityInstance: 2
+  path: /xyz/openbmc_project/sensors/voltage/ps0_input_voltage
+  multiplierM: 1
+  offsetB: 0
+  bExp: 0
+  rExp: 0
+
+69:
+  <<: *voltage
+  entityID: 0x0A
+  entityInstance: 3
+  path: /xyz/openbmc_project/sensors/voltage/ps0_output_voltage
+  multiplierM: 8
+  offsetB: 0
+  bExp: 0
+  rExp: -2
+
+70:
+  <<: *power
+  entityID: 0x0A
+  entityInstance: 4
+  path: /xyz/openbmc_project/sensors/power/ps0_input_power
+  multiplierM: 6
+  offsetB: 0
+  bExp: 0
+  rExp: 0
+
+71:
+  <<: *power
+  entityID: 0x0A
+  entityInstance: 5
+  path: /xyz/openbmc_project/sensors/power/ps0_output_power
+  multiplierM: 6
+  offsetB: 0
+  bExp: 0
+  rExp: 0
+
 76:
   <<: *temperature
   entityID: 0x03
   entityInstance: 1
-  path: /xyz/openbmc_project/sensors/temperature/Core_0_CPU0
+  path: /xyz/openbmc_project/sensors/temperature/cpu0_core0_temp
 
 77:
   <<: *temperature
   entityID: 0x03
   entityInstance: 2
-  path: /xyz/openbmc_project/sensors/temperature/Core_1_CPU0
+  path: /xyz/openbmc_project/sensors/temperature/cpu0_core1_temp
 
 78:
   <<: *temperature
   entityID: 0x03
   entityInstance: 3
-  path: /xyz/openbmc_project/sensors/temperature/Core_2_CPU0
+  path: /xyz/openbmc_project/sensors/temperature/cpu0_core2_temp
 
 79:
   <<: *temperature
   entityID: 0x03
   entityInstance: 4
-  path: /xyz/openbmc_project/sensors/temperature/Core_3_CPU0
+  path: /xyz/openbmc_project/sensors/temperature/cpu0_core3_temp
 80:
   <<: *temperature
   entityID: 0x03
   entityInstance: 5
-  path: /xyz/openbmc_project/sensors/temperature/Core_4_CPU0
+  path: /xyz/openbmc_project/sensors/temperature/cpu0_core4_temp
 81:
   <<: *temperature
   entityID: 0x03
   entityInstance: 6
-  path: /xyz/openbmc_project/sensors/temperature/Core_5_CPU0
+  path: /xyz/openbmc_project/sensors/temperature/cpu0_core5_temp
 82:
   <<: *temperature
   entityID: 0x03
   entityInstance: 7
-  path: /xyz/openbmc_project/sensors/temperature/Core_0_CPU1
+  path: /xyz/openbmc_project/sensors/temperature/cpu1_core0_temp
 83:
   <<: *temperature
   entityID: 0x03
   entityInstance: 8
-  path: /xyz/openbmc_project/sensors/temperature/Core_1_CPU1
+  path: /xyz/openbmc_project/sensors/temperature/cpu1_core1_temp
 
 84:
   <<: *temperature
   entityID: 0x03
   entityInstance: 9
-  path: /xyz/openbmc_project/sensors/temperature/Core_2_CPU1
+  path: /xyz/openbmc_project/sensors/temperature/cpu1_core2_temp
 
 85:
   <<: *temperature
   entityID: 0x03
   entityInstance: 10
-  path: /xyz/openbmc_project/sensors/temperature/Core_3_CPU1
+  path: /xyz/openbmc_project/sensors/temperature/cpu1_core3_temp
 86:
   <<: *temperature
   entityID: 0x03
   entityInstance: 11
-  path: /xyz/openbmc_project/sensors/temperature/Core_4_CPU1
+  path: /xyz/openbmc_project/sensors/temperature/cpu1_core4_temp
 87:
   <<: *temperature
   entityID: 0x03
   entityInstance: 12
-  path: /xyz/openbmc_project/sensors/temperature/Core_5_CPU1
+  path: /xyz/openbmc_project/sensors/temperature/cpu1_core5_temp
 88:
   <<: *temperature
+  entityID: 0x20
+  entityInstance: 1
+  path: /xyz/openbmc_project/sensors/temperature/dimm0_temp
+89:
+  <<: *temperature
+  entityID: 0x20
+  entityInstance: 2
+  path: /xyz/openbmc_project/sensors/temperature/dimm1_temp
+
+90:
+  <<: *temperature
+  entityID: 0x20
+  entityInstance: 3
+  path: /xyz/openbmc_project/sensors/temperature/dimm2_temp
+
+91:
+  <<: *temperature
+  entityID: 0x20
+  entityInstance: 4
+  path: /xyz/openbmc_project/sensors/temperature/dimm3_temp
+
+92:
+  <<: *temperature
+  entityID: 0x20
+  entityInstance: 5
+  path: /xyz/openbmc_project/sensors/temperature/dimm4_temp
+
+93:
+  <<: *temperature
+  entityID: 0x20
+  entityInstance: 6
+  path: /xyz/openbmc_project/sensors/temperature/dimm5_temp
+94:
+  <<: *temperature
+  entityID: 0x20
+  entityInstance: 7
+  path: /xyz/openbmc_project/sensors/temperature/dimm6_temp
+95:
+  <<: *temperature
+  entityID: 0x20
+  entityInstance: 8
+  path: /xyz/openbmc_project/sensors/temperature/dimm7_temp
+
+96:
+  <<: *temperature
+  entityID: 0x20
+  entityInstance: 9
+  path: /xyz/openbmc_project/sensors/temperature/dimm8_temp
+
+97:
+  <<: *temperature
+  entityID: 0x20
+  entityInstance: 10
+  path: /xyz/openbmc_project/sensors/temperature/dimm9_temp
+
+98:
+  <<: *temperature
+  entityID: 0x20
+  entityInstance: 11
+  path: /xyz/openbmc_project/sensors/temperature/dimm10_temp
+
+99:
+  <<: *temperature
+  entityID: 0x20
+  entityInstance: 12
+  path: /xyz/openbmc_project/sensors/temperature/dimm11_temp
+
+100:
+  <<: *temperature
+  entityID: 0x20
+  entityInstance: 13
+  path: /xyz/openbmc_project/sensors/temperature/dimm12_temp
+101:
+  <<: *temperature
+  entityID: 0x20
+  entityInstance: 14
+  path: /xyz/openbmc_project/sensors/temperature/dimm13_temp
+
+102:
+  <<: *temperature
+  entityID: 0x20
+  entityInstance: 15
+  path: /xyz/openbmc_project/sensors/temperature/dimm14_temp
+
+103:
+  <<: *temperature
+  entityID: 0x20
+  entityInstance: 16
+  path: /xyz/openbmc_project/sensors/temperature/dimm15_temp
+
+104:
+  <<: *temperature
+  entityID: 0x20
+  entityInstance: 17
+  path: /xyz/openbmc_project/sensors/temperature/dimm16_temp
+
+105:
+  <<: *temperature
+  entityID: 0x20
+  entityInstance: 18
+  path: /xyz/openbmc_project/sensors/temperature/dimm17_temp
+
+106:
+  <<: *temperature
+  entityID: 0x20
+  entityInstance: 19
+  path: /xyz/openbmc_project/sensors/temperature/dimm18_temp
+107:
+  <<: *temperature
+  entityID: 0x20
+  entityInstance: 20
+  path: /xyz/openbmc_project/sensors/temperature/dimm19_temp
+
+108:
+  <<: *temperature
+  entityID: 0x20
+  entityInstance: 21
+  path: /xyz/openbmc_project/sensors/temperature/dimm20_temp
+
+109:
+  <<: *temperature
+  entityID: 0x20
+  entityInstance: 22
+  path: /xyz/openbmc_project/sensors/temperature/dimm21_temp
+
+110:
+  <<: *temperature
+  entityID: 0x20
+  entityInstance: 23
+  path: /xyz/openbmc_project/sensors/temperature/dimm22_temp
+
+111:
+  <<: *temperature
+  entityID: 0x20
+  entityInstance: 24
+  path: /xyz/openbmc_project/sensors/temperature/dimm23_temp
+
+112: &cpu_present
   entityID: 0x03
   entityInstance: 13
-  path: /xyz/openbmc_project/sensors/temperature/DIMM_C1_CPU0
+  sensorType: 0x07
+  path: /xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0
+  sensorReadingType: 0x6F
+  mutability: Mutability::Write|Mutability::Read
+  serviceInterface: org.freedesktop.DBus.Properties
+  readingType: assertion
+  sensorNamePattern: nameLeaf
+  interfaces:
+        xyz.openbmc_project.Inventory.Item:
+            Present:
+                Offsets:
+                    7:
+                        assert: true
+                        deassert: false
+                        type: bool
 
+113:
+  <<: *cpu_present
+  entityInstance: 14
+  path: /xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1
+
+114: &dimm_present
+  entityID: 0x20
+  sensorType: 0x0C
+  entityInstance: 25
+  path: /xyz/openbmc_project/inventory/system/chassis/motherboard/dimm0
+  sensorReadingType: 0x6F
+  mutability: Mutability::Write|Mutability::Read
+  serviceInterface: org.freedesktop.DBus.Properties
+  readingType: assertion
+  sensorNamePattern: nameLeaf
+  interfaces:
+        xyz.openbmc_project.Inventory.Item:
+            Present:
+                Offsets:
+                    6:
+                        assert: true
+                        deassert: false
+                        type: bool
+
+115:
+  <<: *dimm_present
+  entityInstance: 26
+  path: /xyz/openbmc_project/inventory/system/chassis/motherboard/dimm1
+
+116:
+  <<: *dimm_present
+  entityInstance: 27
+  path: /xyz/openbmc_project/inventory/system/chassis/motherboard/dimm2
+
+117:
+  <<: *dimm_present
+  entityInstance: 28
+  path: /xyz/openbmc_project/inventory/system/chassis/motherboard/dimm3
+
+118:
+  <<: *dimm_present
+  entityInstance: 29
+  path: /xyz/openbmc_project/inventory/system/chassis/motherboard/dimm4
+
+119:
+  <<: *dimm_present
+  entityInstance: 30
+  path: /xyz/openbmc_project/inventory/system/chassis/motherboard/dimm5
+
+120:
+  <<: *dimm_present
+  entityInstance: 31
+  path: /xyz/openbmc_project/inventory/system/chassis/motherboard/dimm6
+
+121:
+  <<: *dimm_present
+  entityInstance: 32
+  path: /xyz/openbmc_project/inventory/system/chassis/motherboard/dimm7
+
+122:
+  <<: *dimm_present
+  entityInstance: 33
+  path: /xyz/openbmc_project/inventory/system/chassis/motherboard/dimm8
+
+123:
+  <<: *dimm_present
+  entityInstance: 34
+  path: /xyz/openbmc_project/inventory/system/chassis/motherboard/dimm9
+
+124:
+  <<: *dimm_present
+  entityInstance: 35
+  path: /xyz/openbmc_project/inventory/system/chassis/motherboard/dimm10
+
+125:
+  <<: *dimm_present
+  entityInstance: 36
+  path: /xyz/openbmc_project/inventory/system/chassis/motherboard/dimm11
+
+126:
+  <<: *dimm_present
+  entityInstance: 37
+  path: /xyz/openbmc_project/inventory/system/chassis/motherboard/dimm12
+
+127:
+  <<: *dimm_present
+  entityInstance: 38
+  path: /xyz/openbmc_project/inventory/system/chassis/motherboard/dimm13
+
+128:
+  <<: *dimm_present
+  entityInstance: 39
+  path: /xyz/openbmc_project/inventory/system/chassis/motherboard/dimm14
+
+129:
+  <<: *dimm_present
+  entityInstance: 40
+  path: /xyz/openbmc_project/inventory/system/chassis/motherboard/dimm15
+
+130:
+  <<: *dimm_present
+  entityInstance: 41
+  path: /xyz/openbmc_project/inventory/system/chassis/motherboard/dimm16
+
+131:
+  <<: *dimm_present
+  entityInstance: 42
+  path: /xyz/openbmc_project/inventory/system/chassis/motherboard/dimm17
+
+132:
+  <<: *dimm_present
+  entityInstance: 43
+  path: /xyz/openbmc_project/inventory/system/chassis/motherboard/dimm18
+
+133:
+  <<: *dimm_present
+  entityInstance: 44
+  path: /xyz/openbmc_project/inventory/system/chassis/motherboard/dimm19
+
+134:
+  <<: *dimm_present
+  entityInstance: 45
+  path: /xyz/openbmc_project/inventory/system/chassis/motherboard/dimm20
+
+135:
+  <<: *dimm_present
+  entityInstance: 46
+  path: /xyz/openbmc_project/inventory/system/chassis/motherboard/dimm21
+
+136:
+  <<: *dimm_present
+  entityInstance: 47
+  path: /xyz/openbmc_project/inventory/system/chassis/motherboard/dimm22
+
+137:
+  <<: *dimm_present
+  entityInstance: 48
+  path: /xyz/openbmc_project/inventory/system/chassis/motherboard/dimm23
diff --git a/meta-olympus-nuvoton/recipes-phosphor/fans/phosphor-pid-control/config-olympus-nuvoton.json b/meta-olympus-nuvoton/recipes-phosphor/fans/phosphor-pid-control/config-olympus-nuvoton.json
index 5a78db6..d10ba04 100644
--- a/meta-olympus-nuvoton/recipes-phosphor/fans/phosphor-pid-control/config-olympus-nuvoton.json
+++ b/meta-olympus-nuvoton/recipes-phosphor/fans/phosphor-pid-control/config-olympus-nuvoton.json
@@ -9,108 +9,108 @@
             "max": 255
         },
         {
-            "name": "Core_0_CPU0",
+            "name": "cpu0_core0_temp",
             "type": "temp",
-            "readPath": "/xyz/openbmc_project/sensors/temperature/Core_0_CPU0",
+            "readPath": "/xyz/openbmc_project/sensors/temperature/cpu0_core0_temp",
             "writePath": "",
             "min": 0,
             "max": 0,
             "timeout": 0
         },
         {
-            "name": "Core_0_CPU1",
+            "name": "cpu1_core0_temp",
             "type": "temp",
-            "readPath": "/xyz/openbmc_project/sensors/temperature/Core_0_CPU1",
+            "readPath": "/xyz/openbmc_project/sensors/temperature/cpu1_core0_temp",
             "writePath": "",
             "min": 0,
             "max": 0,
             "timeout": 0
         },
         {
-            "name": "Core_1_CPU0",
+            "name": "cpu0_core1_temp",
             "type": "temp",
-            "readPath": "/xyz/openbmc_project/sensors/temperature/Core_1_CPU0",
+            "readPath": "/xyz/openbmc_project/sensors/temperature/cpu0_core1_temp",
             "writePath": "",
             "min": 0,
             "max": 0,
             "timeout": 0
         },
         {
-            "name": "Core_1_CPU1",
+            "name": "cpu1_core1_temp",
             "type": "temp",
-            "readPath": "/xyz/openbmc_project/sensors/temperature/Core_1_CPU1",
+            "readPath": "/xyz/openbmc_project/sensors/temperature/cpu1_core1_temp",
             "writePath": "",
             "min": 0,
             "max": 0,
             "timeout": 0
         },
         {
-            "name": "Core_2_CPU0",
+            "name": "cpu0_core2_temp",
             "type": "temp",
-            "readPath": "/xyz/openbmc_project/sensors/temperature/Core_2_CPU0",
+            "readPath": "/xyz/openbmc_project/sensors/temperature/cpu0_core2_temp",
             "writePath": "",
             "min": 0,
             "max": 0,
             "timeout": 0
         },
         {
-            "name": "Core_2_CPU1",
+            "name": "cpu1_core2_temp",
             "type": "temp",
-            "readPath": "/xyz/openbmc_project/sensors/temperature/Core_2_CPU1",
+            "readPath": "/xyz/openbmc_project/sensors/temperature/cpu1_core2_temp",
             "writePath": "",
             "min": 0,
             "max": 0,
             "timeout": 0
         },
         {
-            "name": "Core_3_CPU0",
+            "name": "cpu0_core3_temp",
             "type": "temp",
-            "readPath": "/xyz/openbmc_project/sensors/temperature/Core_3_CPU0",
+            "readPath": "/xyz/openbmc_project/sensors/temperature/cpu0_core3_temp",
             "writePath": "",
             "min": 0,
             "max": 0,
             "timeout": 0
         },
         {
-            "name": "Core_3_CPU1",
+            "name": "cpu1_core3_temp",
             "type": "temp",
-            "readPath": "/xyz/openbmc_project/sensors/temperature/Core_3_CPU1",
+            "readPath": "/xyz/openbmc_project/sensors/temperature/cpu1_core3_temp",
             "writePath": "",
             "min": 0,
             "max": 0,
             "timeout": 0
         },
         {
-            "name": "Core_4_CPU0",
+            "name": "cpu0_core4_temp",
             "type": "temp",
-            "readPath": "/xyz/openbmc_project/sensors/temperature/Core_4_CPU0",
+            "readPath": "/xyz/openbmc_project/sensors/temperature/cpu0_core4_temp",
             "writePath": "",
             "min": 0,
             "max": 0,
             "timeout": 0
         },
         {
-            "name": "Core_4_CPU1",
+            "name": "cpu1_core4_temp",
             "type": "temp",
-            "readPath": "/xyz/openbmc_project/sensors/temperature/Core_4_CPU1",
+            "readPath": "/xyz/openbmc_project/sensors/temperature/cpu1_core4_temp",
             "writePath": "",
             "min": 0,
             "max": 0,
             "timeout": 0
         },
         {
-            "name": "Core_5_CPU0",
+            "name": "cpu0_core5_temp",
             "type": "temp",
-            "readPath": "/xyz/openbmc_project/sensors/temperature/Core_5_CPU0",
+            "readPath": "/xyz/openbmc_project/sensors/temperature/cpu0_core5_temp",
             "writePath": "",
             "min": 0,
             "max": 0,
             "timeout": 0
         },
         {
-            "name": "Core_5_CPU1",
+            "name": "cpu1_core5_temp",
             "type": "temp",
-            "readPath": "/xyz/openbmc_project/sensors/temperature/Core_5_CPU1",
+            "readPath": "/xyz/openbmc_project/sensors/temperature/cpu1_core5_temp",
             "writePath": "",
             "min": 0,
             "max": 0,
@@ -143,255 +143,675 @@
                     }
                 },
                 {
-                    "name": "Core_0_CPU0",
-                    "type": "temp",
-                    "inputs": ["Core_0_CPU0"],
+                    "name": "cpu0_core0_temp",
+                    "type": "stepwise",
+                    "inputs": ["cpu0_core0_temp"],
                     "setpoint": 30.0,
                     "pid": {
                         "samplePeriod": 1.0,
-                        "proportionalCoeff": -20.0,
-                        "integralCoeff": -0.1,
-                        "feedFwdOffsetCoeff": 0.0,
-                        "feedFwdGainCoeff": 0.0,
-                        "integralLimit_min": 0.0,
-                        "integralLimit_max": 0.0,
-                        "outLim_min": 0.0,
-                        "outLim_max": 16000.0,
-                        "slewNeg": 0.0,
-                        "slewPos": 0.0,
-                        "positiveHysteresis": 1.0,
-                        "negativeHysteresis": 1.0
+                        "positiveHysteresis": 0.0,
+                        "negativeHysteresis": 0.0,
+                        "isCeiling": false,
+                        "reading": {
+                            "0": 25,
+                            "1": 26,
+                            "2": 27,
+                            "3": 28,
+                            "4": 29,
+                            "5": 30,
+                            "6": 31,
+                            "7": 32,
+                            "8": 33,
+                            "9": 34,
+                            "10": 35,
+                            "11": 36,
+                            "12": 37,
+                            "13": 38,
+                            "14": 39,
+                            "15": 40,
+                            "16": 42,
+                            "17": 44,
+                            "18": 45,
+                            "19": 50
+                        },
+                        "output": {
+                            "0": 10,
+                            "1": 10,
+                            "2": 10,
+                            "3": 10,
+                            "4": 10,
+                            "5": 10,
+                            "6": 20,
+                            "7": 30,
+                            "8": 40,
+                            "9": 50,
+                            "10": 60,
+                            "11": 73,
+                            "12": 76,
+                            "13": 79,
+                            "14": 82,
+                            "15": 86,
+                            "16": 90,
+                            "17": 90,
+                            "18": 100,
+                            "19": 100
+                        }
                     }
                 },
                 {
-                    "name": "Core_0_CPU1",
-                    "type": "temp",
-                    "inputs": ["Core_0_CPU1"],
+                    "name": "cpu1_core0_temp",
+                    "type": "stepwise",
+                    "inputs": ["cpu1_core0_temp"],
                     "setpoint": 30.0,
                     "pid": {
                         "samplePeriod": 1.0,
-                        "proportionalCoeff": -20.0,
-                        "integralCoeff": -0.1,
-                        "feedFwdOffsetCoeff": 0.0,
-                        "feedFwdGainCoeff": 0.0,
-                        "integralLimit_min": 0.0,
-                        "integralLimit_max": 0.0,
-                        "outLim_min": 0.0,
-                        "outLim_max": 16000.0,
-                        "slewNeg": 0.0,
-                        "slewPos": 0.0,
-                        "positiveHysteresis": 1.0,
-                        "negativeHysteresis": 1.0
+                        "positiveHysteresis": 0.0,
+                        "negativeHysteresis": 0.0,
+                        "isCeiling": false,
+                        "reading": {
+                            "0": 25,
+                            "1": 26,
+                            "2": 27,
+                            "3": 28,
+                            "4": 29,
+                            "5": 30,
+                            "6": 31,
+                            "7": 32,
+                            "8": 33,
+                            "9": 34,
+                            "10": 35,
+                            "11": 36,
+                            "12": 37,
+                            "13": 38,
+                            "14": 39,
+                            "15": 40,
+                            "16": 42,
+                            "17": 44,
+                            "18": 45,
+                            "19": 50
+                        },
+                        "output": {
+                            "0": 10,
+                            "1": 10,
+                            "2": 10,
+                            "3": 10,
+                            "4": 10,
+                            "5": 10,
+                            "6": 20,
+                            "7": 30,
+                            "8": 40,
+                            "9": 50,
+                            "10": 60,
+                            "11": 73,
+                            "12": 76,
+                            "13": 79,
+                            "14": 82,
+                            "15": 86,
+                            "16": 90,
+                            "17": 90,
+                            "18": 100,
+                            "19": 100
+                        }
                     }
                 },
                 {
-                    "name": "Core_1_CPU0",
-                    "type": "temp",
-                    "inputs": ["Core_1_CPU0"],
+                    "name": "cpu0_core1_temp",
+                    "type": "stepwise",
+                    "inputs": ["cpu0_core1_temp"],
                     "setpoint": 30.0,
                     "pid": {
                         "samplePeriod": 1.0,
-                        "proportionalCoeff": -20.0,
-                        "integralCoeff": -0.1,
-                        "feedFwdOffsetCoeff": 0.0,
-                        "feedFwdGainCoeff": 0.0,
-                        "integralLimit_min": 0.0,
-                        "integralLimit_max": 0.0,
-                        "outLim_min": 0.0,
-                        "outLim_max": 16000.0,
-                        "slewNeg": 0.0,
-                        "slewPos": 0.0,
-                        "positiveHysteresis": 1.0,
-                        "negativeHysteresis": 1.0
+                        "positiveHysteresis": 0.0,
+                        "negativeHysteresis": 0.0,
+                        "isCeiling": false,
+                        "reading": {
+                            "0": 25,
+                            "1": 26,
+                            "2": 27,
+                            "3": 28,
+                            "4": 29,
+                            "5": 30,
+                            "6": 31,
+                            "7": 32,
+                            "8": 33,
+                            "9": 34,
+                            "10": 35,
+                            "11": 36,
+                            "12": 37,
+                            "13": 38,
+                            "14": 39,
+                            "15": 40,
+                            "16": 42,
+                            "17": 44,
+                            "18": 45,
+                            "19": 50
+                        },
+                        "output": {
+                            "0": 10,
+                            "1": 10,
+                            "2": 10,
+                            "3": 10,
+                            "4": 10,
+                            "5": 10,
+                            "6": 20,
+                            "7": 30,
+                            "8": 40,
+                            "9": 50,
+                            "10": 60,
+                            "11": 73,
+                            "12": 76,
+                            "13": 79,
+                            "14": 82,
+                            "15": 86,
+                            "16": 90,
+                            "17": 90,
+                            "18": 100,
+                            "19": 100
+                        }
                     }
                 },
                 {
-                    "name": "Core_1_CPU1",
-                    "type": "temp",
-                    "inputs": ["Core_1_CPU1"],
+                    "name": "cpu1_core1_temp",
+                    "type": "stepwise",
+                    "inputs": ["cpu1_core1_temp"],
                     "setpoint": 30.0,
                     "pid": {
                         "samplePeriod": 1.0,
-                        "proportionalCoeff": -20.0,
-                        "integralCoeff": -0.1,
-                        "feedFwdOffsetCoeff": 0.0,
-                        "feedFwdGainCoeff": 0.0,
-                        "integralLimit_min": 0.0,
-                        "integralLimit_max": 0.0,
-                        "outLim_min": 0.0,
-                        "outLim_max": 16000.0,
-                        "slewNeg": 0.0,
-                        "slewPos": 0.0,
-                        "positiveHysteresis": 1.0,
-                        "negativeHysteresis": 1.0
+                        "positiveHysteresis": 0.0,
+                        "negativeHysteresis": 0.0,
+                        "isCeiling": false,
+                        "reading": {
+                            "0": 25,
+                            "1": 26,
+                            "2": 27,
+                            "3": 28,
+                            "4": 29,
+                            "5": 30,
+                            "6": 31,
+                            "7": 32,
+                            "8": 33,
+                            "9": 34,
+                            "10": 35,
+                            "11": 36,
+                            "12": 37,
+                            "13": 38,
+                            "14": 39,
+                            "15": 40,
+                            "16": 42,
+                            "17": 44,
+                            "18": 45,
+                            "19": 50
+                        },
+                        "output": {
+                            "0": 10,
+                            "1": 10,
+                            "2": 10,
+                            "3": 10,
+                            "4": 10,
+                            "5": 10,
+                            "6": 20,
+                            "7": 30,
+                            "8": 40,
+                            "9": 50,
+                            "10": 60,
+                            "11": 73,
+                            "12": 76,
+                            "13": 79,
+                            "14": 82,
+                            "15": 86,
+                            "16": 90,
+                            "17": 90,
+                            "18": 100,
+                            "19": 100
+                        }
                     }
                 },
                 {
-                    "name": "Core_2_CPU0",
-                    "type": "temp",
-                    "inputs": ["Core_2_CPU0"],
+                    "name": "cpu0_core2_temp",
+                    "type": "stepwise",
+                    "inputs": ["cpu0_core2_temp"],
                     "setpoint": 30.0,
                     "pid": {
                         "samplePeriod": 1.0,
-                        "proportionalCoeff": -20.0,
-                        "integralCoeff": -0.1,
-                        "feedFwdOffsetCoeff": 0.0,
-                        "feedFwdGainCoeff": 0.0,
-                        "integralLimit_min": 0.0,
-                        "integralLimit_max": 0.0,
-                        "outLim_min": 0.0,
-                        "outLim_max": 16000.0,
-                        "slewNeg": 0.0,
-                        "slewPos": 0.0,
-                        "positiveHysteresis": 1.0,
-                        "negativeHysteresis": 1.0
+                        "positiveHysteresis": 0.0,
+                        "negativeHysteresis": 0.0,
+                        "isCeiling": false,
+                        "reading": {
+                            "0": 25,
+                            "1": 26,
+                            "2": 27,
+                            "3": 28,
+                            "4": 29,
+                            "5": 30,
+                            "6": 31,
+                            "7": 32,
+                            "8": 33,
+                            "9": 34,
+                            "10": 35,
+                            "11": 36,
+                            "12": 37,
+                            "13": 38,
+                            "14": 39,
+                            "15": 40,
+                            "16": 42,
+                            "17": 44,
+                            "18": 45,
+                            "19": 50
+                        },
+                        "output": {
+                            "0": 10,
+                            "1": 10,
+                            "2": 10,
+                            "3": 10,
+                            "4": 10,
+                            "5": 10,
+                            "6": 20,
+                            "7": 30,
+                            "8": 40,
+                            "9": 50,
+                            "10": 60,
+                            "11": 73,
+                            "12": 76,
+                            "13": 79,
+                            "14": 82,
+                            "15": 86,
+                            "16": 90,
+                            "17": 90,
+                            "18": 100,
+                            "19": 100
+                        }
                     }
                 },
                 {
-                    "name": "Core_2_CPU1",
-                    "type": "temp",
-                    "inputs": ["Core_2_CPU1"],
+                    "name": "cpu1_core2_temp",
+                    "type": "stepwise",
+                    "inputs": ["cpu1_core2_temp"],
                     "setpoint": 30.0,
                     "pid": {
                         "samplePeriod": 1.0,
-                        "proportionalCoeff": -20.0,
-                        "integralCoeff": -0.1,
-                        "feedFwdOffsetCoeff": 0.0,
-                        "feedFwdGainCoeff": 0.0,
-                        "integralLimit_min": 0.0,
-                        "integralLimit_max": 0.0,
-                        "outLim_min": 0.0,
-                        "outLim_max": 16000.0,
-                        "slewNeg": 0.0,
-                        "slewPos": 0.0,
-                        "positiveHysteresis": 1.0,
-                        "negativeHysteresis": 1.0
+                        "positiveHysteresis": 0.0,
+                        "negativeHysteresis": 0.0,
+                        "isCeiling": false,
+                        "reading": {
+                            "0": 25,
+                            "1": 26,
+                            "2": 27,
+                            "3": 28,
+                            "4": 29,
+                            "5": 30,
+                            "6": 31,
+                            "7": 32,
+                            "8": 33,
+                            "9": 34,
+                            "10": 35,
+                            "11": 36,
+                            "12": 37,
+                            "13": 38,
+                            "14": 39,
+                            "15": 40,
+                            "16": 42,
+                            "17": 44,
+                            "18": 45,
+                            "19": 50
+                        },
+                        "output": {
+                            "0": 10,
+                            "1": 10,
+                            "2": 10,
+                            "3": 10,
+                            "4": 10,
+                            "5": 10,
+                            "6": 20,
+                            "7": 30,
+                            "8": 40,
+                            "9": 50,
+                            "10": 60,
+                            "11": 73,
+                            "12": 76,
+                            "13": 79,
+                            "14": 82,
+                            "15": 86,
+                            "16": 90,
+                            "17": 90,
+                            "18": 100,
+                            "19": 100
+                        }
                     }
                 },
                 {
-                    "name": "Core_3_CPU0",
-                    "type": "temp",
-                    "inputs": ["Core_3_CPU0"],
+                    "name": "cpu0_core3_temp",
+                    "type": "stepwise",
+                    "inputs": ["cpu0_core3_temp"],
                     "setpoint": 30.0,
                     "pid": {
                         "samplePeriod": 1.0,
-                        "proportionalCoeff": -20.0,
-                        "integralCoeff": -0.1,
-                        "feedFwdOffsetCoeff": 0.0,
-                        "feedFwdGainCoeff": 0.0,
-                        "integralLimit_min": 0.0,
-                        "integralLimit_max": 0.0,
-                        "outLim_min": 0.0,
-                        "outLim_max": 16000.0,
-                        "slewNeg": 0.0,
-                        "slewPos": 0.0,
-                        "positiveHysteresis": 1.0,
-                        "negativeHysteresis": 1.0
+                        "positiveHysteresis": 0.0,
+                        "negativeHysteresis": 0.0,
+                        "isCeiling": false,
+                        "reading": {
+                            "0": 25,
+                            "1": 26,
+                            "2": 27,
+                            "3": 28,
+                            "4": 29,
+                            "5": 30,
+                            "6": 31,
+                            "7": 32,
+                            "8": 33,
+                            "9": 34,
+                            "10": 35,
+                            "11": 36,
+                            "12": 37,
+                            "13": 38,
+                            "14": 39,
+                            "15": 40,
+                            "16": 42,
+                            "17": 44,
+                            "18": 45,
+                            "19": 50
+                        },
+                        "output": {
+                            "0": 10,
+                            "1": 10,
+                            "2": 10,
+                            "3": 10,
+                            "4": 10,
+                            "5": 10,
+                            "6": 20,
+                            "7": 30,
+                            "8": 40,
+                            "9": 50,
+                            "10": 60,
+                            "11": 73,
+                            "12": 76,
+                            "13": 79,
+                            "14": 82,
+                            "15": 86,
+                            "16": 90,
+                            "17": 90,
+                            "18": 100,
+                            "19": 100
+                        }
                     }
                 },
                 {
-                    "name": "Core_3_CPU1",
-                    "type": "temp",
-                    "inputs": ["Core_3_CPU1"],
+                    "name": "cpu1_core3_temp",
+                    "type": "stepwise",
+                    "inputs": ["cpu1_core3_temp"],
                     "setpoint": 30.0,
                     "pid": {
                         "samplePeriod": 1.0,
-                        "proportionalCoeff": -20.0,
-                        "integralCoeff": -0.1,
-                        "feedFwdOffsetCoeff": 0.0,
-                        "feedFwdGainCoeff": 0.0,
-                        "integralLimit_min": 0.0,
-                        "integralLimit_max": 0.0,
-                        "outLim_min": 0.0,
-                        "outLim_max": 16000.0,
-                        "slewNeg": 0.0,
-                        "slewPos": 0.0,
-                        "positiveHysteresis": 1.0,
-                        "negativeHysteresis": 1.0
+                        "positiveHysteresis": 0.0,
+                        "negativeHysteresis": 0.0,
+                        "isCeiling": false,
+                        "reading": {
+                            "0": 25,
+                            "1": 26,
+                            "2": 27,
+                            "3": 28,
+                            "4": 29,
+                            "5": 30,
+                            "6": 31,
+                            "7": 32,
+                            "8": 33,
+                            "9": 34,
+                            "10": 35,
+                            "11": 36,
+                            "12": 37,
+                            "13": 38,
+                            "14": 39,
+                            "15": 40,
+                            "16": 42,
+                            "17": 44,
+                            "18": 45,
+                            "19": 50
+                        },
+                        "output": {
+                            "0": 10,
+                            "1": 10,
+                            "2": 10,
+                            "3": 10,
+                            "4": 10,
+                            "5": 10,
+                            "6": 20,
+                            "7": 30,
+                            "8": 40,
+                            "9": 50,
+                            "10": 60,
+                            "11": 73,
+                            "12": 76,
+                            "13": 79,
+                            "14": 82,
+                            "15": 86,
+                            "16": 90,
+                            "17": 90,
+                            "18": 100,
+                            "19": 100
+                        }
                     }
                 },
                 {
-                    "name": "Core_4_CPU0",
-                    "type": "temp",
-                    "inputs": ["Core_4_CPU0"],
+                    "name": "cpu0_core4_temp",
+                    "type": "stepwise",
+                    "inputs": ["cpu0_core4_temp"],
                     "setpoint": 30.0,
                     "pid": {
                         "samplePeriod": 1.0,
-                        "proportionalCoeff": -20.0,
-                        "integralCoeff": -0.1,
-                        "feedFwdOffsetCoeff": 0.0,
-                        "feedFwdGainCoeff": 0.0,
-                        "integralLimit_min": 0.0,
-                        "integralLimit_max": 0.0,
-                        "outLim_min": 0.0,
-                        "outLim_max": 16000.0,
-                        "slewNeg": 0.0,
-                        "slewPos": 0.0,
-                        "positiveHysteresis": 1.0,
-                        "negativeHysteresis": 1.0
+                        "positiveHysteresis": 0.0,
+                        "negativeHysteresis": 0.0,
+                        "isCeiling": false,
+                        "reading": {
+                            "0": 25,
+                            "1": 26,
+                            "2": 27,
+                            "3": 28,
+                            "4": 29,
+                            "5": 30,
+                            "6": 31,
+                            "7": 32,
+                            "8": 33,
+                            "9": 34,
+                            "10": 35,
+                            "11": 36,
+                            "12": 37,
+                            "13": 38,
+                            "14": 39,
+                            "15": 40,
+                            "16": 42,
+                            "17": 44,
+                            "18": 45,
+                            "19": 50
+                        },
+                        "output": {
+                            "0": 10,
+                            "1": 10,
+                            "2": 10,
+                            "3": 10,
+                            "4": 10,
+                            "5": 10,
+                            "6": 20,
+                            "7": 30,
+                            "8": 40,
+                            "9": 50,
+                            "10": 60,
+                            "11": 73,
+                            "12": 76,
+                            "13": 79,
+                            "14": 82,
+                            "15": 86,
+                            "16": 90,
+                            "17": 90,
+                            "18": 100,
+                            "19": 100
+                        }
                     }
                 },
                 {
-                    "name": "Core_4_CPU1",
-                    "type": "temp",
-                    "inputs": ["Core_4_CPU1"],
+                    "name": "cpu1_core4_temp",
+                    "type": "stepwise",
+                    "inputs": ["cpu1_core4_temp"],
                     "setpoint": 30.0,
                     "pid": {
                         "samplePeriod": 1.0,
-                        "proportionalCoeff": -20.0,
-                        "integralCoeff": -0.1,
-                        "feedFwdOffsetCoeff": 0.0,
-                        "feedFwdGainCoeff": 0.0,
-                        "integralLimit_min": 0.0,
-                        "integralLimit_max": 0.0,
-                        "outLim_min": 0.0,
-                        "outLim_max": 16000.0,
-                        "slewNeg": 0.0,
-                        "slewPos": 0.0,
-                        "positiveHysteresis": 1.0,
-                        "negativeHysteresis": 1.0
+                        "positiveHysteresis": 0.0,
+                        "negativeHysteresis": 0.0,
+                        "isCeiling": false,
+                        "reading": {
+                            "0": 25,
+                            "1": 26,
+                            "2": 27,
+                            "3": 28,
+                            "4": 29,
+                            "5": 30,
+                            "6": 31,
+                            "7": 32,
+                            "8": 33,
+                            "9": 34,
+                            "10": 35,
+                            "11": 36,
+                            "12": 37,
+                            "13": 38,
+                            "14": 39,
+                            "15": 40,
+                            "16": 42,
+                            "17": 44,
+                            "18": 45,
+                            "19": 50
+                        },
+                        "output": {
+                            "0": 10,
+                            "1": 10,
+                            "2": 10,
+                            "3": 10,
+                            "4": 10,
+                            "5": 10,
+                            "6": 20,
+                            "7": 30,
+                            "8": 40,
+                            "9": 50,
+                            "10": 60,
+                            "11": 73,
+                            "12": 76,
+                            "13": 79,
+                            "14": 82,
+                            "15": 86,
+                            "16": 90,
+                            "17": 90,
+                            "18": 100,
+                            "19": 100
+                        }
                     }
                 },
                 {
-                    "name": "Core_5_CPU0",
-                    "type": "temp",
-                    "inputs": ["Core_5_CPU0"],
+                    "name": "cpu0_core5_temp",
+                    "type": "stepwise",
+                    "inputs": ["cpu0_core5_temp"],
                     "setpoint": 30.0,
                     "pid": {
                         "samplePeriod": 1.0,
-                        "proportionalCoeff": -20.0,
-                        "integralCoeff": -0.1,
-                        "feedFwdOffsetCoeff": 0.0,
-                        "feedFwdGainCoeff": 0.0,
-                        "integralLimit_min": 0.0,
-                        "integralLimit_max": 0.0,
-                        "outLim_min": 0.0,
-                        "outLim_max": 16000.0,
-                        "slewNeg": 0.0,
-                        "slewPos": 0.0,
-                        "positiveHysteresis": 1.0,
-                        "negativeHysteresis": 1.0
+                        "positiveHysteresis": 0.0,
+                        "negativeHysteresis": 0.0,
+                        "isCeiling": false,
+                        "reading": {
+                            "0": 25,
+                            "1": 26,
+                            "2": 27,
+                            "3": 28,
+                            "4": 29,
+                            "5": 30,
+                            "6": 31,
+                            "7": 32,
+                            "8": 33,
+                            "9": 34,
+                            "10": 35,
+                            "11": 36,
+                            "12": 37,
+                            "13": 38,
+                            "14": 39,
+                            "15": 40,
+                            "16": 42,
+                            "17": 44,
+                            "18": 45,
+                            "19": 50
+                        },
+                        "output": {
+                            "0": 10,
+                            "1": 10,
+                            "2": 10,
+                            "3": 10,
+                            "4": 10,
+                            "5": 10,
+                            "6": 20,
+                            "7": 30,
+                            "8": 40,
+                            "9": 50,
+                            "10": 60,
+                            "11": 73,
+                            "12": 76,
+                            "13": 79,
+                            "14": 82,
+                            "15": 86,
+                            "16": 90,
+                            "17": 90,
+                            "18": 100,
+                            "19": 100
+                        }
                     }
                 },
                 {
-                    "name": "Core_5_CPU1",
-                    "type": "temp",
-                    "inputs": ["Core_5_CPU1"],
+                    "name": "cpu1_core5_temp",
+                    "type": "stepwise",
+                    "inputs": ["cpu1_core5_temp"],
                     "setpoint": 30.0,
                     "pid": {
                         "samplePeriod": 1.0,
-                        "proportionalCoeff": -20.0,
-                        "integralCoeff": -0.1,
-                        "feedFwdOffsetCoeff": 0.0,
-                        "feedFwdGainCoeff": 0.0,
-                        "integralLimit_min": 0.0,
-                        "integralLimit_max": 0.0,
-                        "outLim_min": 0.0,
-                        "outLim_max": 16000.0,
-                        "slewNeg": 0.0,
-                        "slewPos": 0.0,
-                        "positiveHysteresis": 1.0,
-                        "negativeHysteresis": 1.0
+                        "positiveHysteresis": 0.0,
+                        "negativeHysteresis": 0.0,
+                        "isCeiling": false,
+                        "reading": {
+                            "0": 25,
+                            "1": 26,
+                            "2": 27,
+                            "3": 28,
+                            "4": 29,
+                            "5": 30,
+                            "6": 31,
+                            "7": 32,
+                            "8": 33,
+                            "9": 34,
+                            "10": 35,
+                            "11": 36,
+                            "12": 37,
+                            "13": 38,
+                            "14": 39,
+                            "15": 40,
+                            "16": 42,
+                            "17": 44,
+                            "18": 45,
+                            "19": 50
+                        },
+                        "output": {
+                            "0": 10,
+                            "1": 10,
+                            "2": 10,
+                            "3": 10,
+                            "4": 10,
+                            "5": 10,
+                            "6": 20,
+                            "7": 30,
+                            "8": 40,
+                            "9": 50,
+                            "10": 60,
+                            "11": 73,
+                            "12": 76,
+                            "13": 79,
+                            "14": 82,
+                            "15": 86,
+                            "16": 90,
+                            "17": 90,
+                            "18": 100,
+                            "19": 100
+                        }
                     }
                 }
             ]
diff --git a/meta-olympus-nuvoton/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json b/meta-olympus-nuvoton/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json
index 1119d68..e25e1d0 100644
--- a/meta-olympus-nuvoton/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json
+++ b/meta-olympus-nuvoton/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json
@@ -153,17 +153,23 @@
                     "/xyz/openbmc_project/sensors/power/cpu_power",
                     "/xyz/openbmc_project/sensors/power/memory_power",
                     "/xyz/openbmc_project/sensors/current/p0_dimm_vr0_current",
-                    "/xyz/openbmc_project/sensors/current/p0_dimm_vr0_lin",
+                    "/xyz/openbmc_project/sensors/current/p0_dimm_vr0_iin",
                     "/xyz/openbmc_project/sensors/current/p0_dimm_vr1_current",
-                    "/xyz/openbmc_project/sensors/current/p0_dimm_vr1_lin",
+                    "/xyz/openbmc_project/sensors/current/p0_dimm_vr1_iin",
                     "/xyz/openbmc_project/sensors/current/p0_vccin_vr_current",
                     "/xyz/openbmc_project/sensors/current/p0_vccio_vr_current",
                     "/xyz/openbmc_project/sensors/current/p1_dimm_vr0_current",
-                    "/xyz/openbmc_project/sensors/current/p1_dimm_vr0_lin",
+                    "/xyz/openbmc_project/sensors/current/p1_dimm_vr0_iin",
                     "/xyz/openbmc_project/sensors/current/p1_dimm_vr1_current",
-                    "/xyz/openbmc_project/sensors/current/p1_dimm_vr1_lin",
+                    "/xyz/openbmc_project/sensors/current/p1_dimm_vr1_iin",
                     "/xyz/openbmc_project/sensors/current/p1_vccin_vr_current",
-                    "/xyz/openbmc_project/sensors/current/p1_vccio_vr_current"
+                    "/xyz/openbmc_project/sensors/current/p1_vccio_vr_current",
+                    "/xyz/openbmc_project/sensors/current/hotswap_iout",
+                    "/xyz/openbmc_project/sensors/power/hotswap_pout",
+                    "/xyz/openbmc_project/sensors/temperature/hotswap_temp",
+                    "/xyz/openbmc_project/sensors/voltage/hotswap_vin",
+                    "/xyz/openbmc_project/sensors/voltage/hotswap_vout"
+
                 ]
             }
         ]
@@ -180,13 +186,13 @@
                 },
                 "paths":
                 [
-                    "/xyz/openbmc_project/sensors/temperature/Core_0_CPU0",
-                    "/xyz/openbmc_project/sensors/temperature/Core_1_CPU0",
-                    "/xyz/openbmc_project/sensors/temperature/Core_2_CPU0",
-                    "/xyz/openbmc_project/sensors/temperature/Core_3_CPU0",
-                    "/xyz/openbmc_project/sensors/temperature/Core_4_CPU0",
-                    "/xyz/openbmc_project/sensors/temperature/Core_5_CPU0",
-                    "/xyz/openbmc_project/sensors/temperature/Die_CPU0"
+                    "/xyz/openbmc_project/sensors/temperature/cpu0_core0_temp",
+                    "/xyz/openbmc_project/sensors/temperature/cpu0_core1_temp",
+                    "/xyz/openbmc_project/sensors/temperature/cpu0_core2_temp",
+                    "/xyz/openbmc_project/sensors/temperature/cpu0_core3_temp",
+                    "/xyz/openbmc_project/sensors/temperature/cpu0_core4_temp",
+                    "/xyz/openbmc_project/sensors/temperature/cpu0_core5_temp",
+                    "/xyz/openbmc_project/sensors/temperature/cpu0_die_temp"
                 ]
             }
         ]
@@ -203,13 +209,421 @@
                 },
                 "paths":
                 [
-                    "/xyz/openbmc_project/sensors/temperature/Core_0_CPU1",
-                    "/xyz/openbmc_project/sensors/temperature/Core_1_CPU1",
-                    "/xyz/openbmc_project/sensors/temperature/Core_2_CPU1",
-                    "/xyz/openbmc_project/sensors/temperature/Core_3_CPU1",
-                    "/xyz/openbmc_project/sensors/temperature/Core_4_CPU1",
-                    "/xyz/openbmc_project/sensors/temperature/Core_5_CPU1",
-                    "/xyz/openbmc_project/sensors/temperature/Die_CPU0"
+                    "/xyz/openbmc_project/sensors/temperature/cpu1_core0_temp",
+                    "/xyz/openbmc_project/sensors/temperature/cpu1_core1_temp",
+                    "/xyz/openbmc_project/sensors/temperature/cpu1_core2_temp",
+                    "/xyz/openbmc_project/sensors/temperature/cpu1_core3_temp",
+                    "/xyz/openbmc_project/sensors/temperature/cpu1_core4_temp",
+                    "/xyz/openbmc_project/sensors/temperature/cpu1_core5_temp",
+                    "/xyz/openbmc_project/sensors/temperature/cpu1_die_temp"
+                ]
+            }
+        ]
+    },
+    {
+        "path": "system/chassis/motherboard/dimm0",
+        "endpoints":
+        [
+            {
+                "types":
+                {
+                    "rType": "inventory",
+                    "fType": "sensors"
+                },
+                "paths":
+                [
+                    "/xyz/openbmc_project/sensors/temperature/dimm0_temp"
+                ]
+            }
+        ]
+    },
+    {
+        "path": "system/chassis/motherboard/dimm1",
+        "endpoints":
+        [
+            {
+                "types":
+                {
+                    "rType": "inventory",
+                    "fType": "sensors"
+                },
+                "paths":
+                [
+                    "/xyz/openbmc_project/sensors/temperature/dimm1_temp"
+                ]
+            }
+        ]
+    },
+    {
+        "path": "system/chassis/motherboard/dimm2",
+        "endpoints":
+        [
+            {
+                "types":
+                {
+                    "rType": "inventory",
+                    "fType": "sensors"
+                },
+                "paths":
+                [
+                    "/xyz/openbmc_project/sensors/temperature/dimm2_temp"
+                ]
+            }
+        ]
+    },
+    {
+        "path": "system/chassis/motherboard/dimm3",
+        "endpoints":
+        [
+            {
+                "types":
+                {
+                    "rType": "inventory",
+                    "fType": "sensors"
+                },
+                "paths":
+                [
+                    "/xyz/openbmc_project/sensors/temperature/dimm3_temp"
+                ]
+            }
+        ]
+    },
+    {
+        "path": "system/chassis/motherboard/dimm4",
+        "endpoints":
+        [
+            {
+                "types":
+                {
+                    "rType": "inventory",
+                    "fType": "sensors"
+                },
+                "paths":
+                [
+                    "/xyz/openbmc_project/sensors/temperature/dimm4_temp"
+                ]
+            }
+        ]
+    },
+    {
+        "path": "system/chassis/motherboard/dimm5",
+        "endpoints":
+        [
+            {
+                "types":
+                {
+                    "rType": "inventory",
+                    "fType": "sensors"
+                },
+                "paths":
+                [
+                    "/xyz/openbmc_project/sensors/temperature/dimm5_temp"
+                ]
+            }
+        ]
+    },
+    {
+        "path": "system/chassis/motherboard/dimm6",
+        "endpoints":
+        [
+            {
+                "types":
+                {
+                    "rType": "inventory",
+                    "fType": "sensors"
+                },
+                "paths":
+                [
+                    "/xyz/openbmc_project/sensors/temperature/dimm6_temp"
+                ]
+            }
+        ]
+    },
+    {
+        "path": "system/chassis/motherboard/dimm7",
+        "endpoints":
+        [
+            {
+                "types":
+                {
+                    "rType": "inventory",
+                    "fType": "sensors"
+                },
+                "paths":
+                [
+                    "/xyz/openbmc_project/sensors/temperature/dimm7_temp"
+                ]
+            }
+        ]
+    },
+    {
+        "path": "system/chassis/motherboard/dimm8",
+        "endpoints":
+        [
+            {
+                "types":
+                {
+                    "rType": "inventory",
+                    "fType": "sensors"
+                },
+                "paths":
+                [
+                    "/xyz/openbmc_project/sensors/temperature/dimm8_temp"
+                ]
+            }
+        ]
+    },
+    {
+        "path": "system/chassis/motherboard/dimm9",
+        "endpoints":
+        [
+            {
+                "types":
+                {
+                    "rType": "inventory",
+                    "fType": "sensors"
+                },
+                "paths":
+                [
+                    "/xyz/openbmc_project/sensors/temperature/dimm9_temp"
+                ]
+            }
+        ]
+    },
+    {
+        "path": "system/chassis/motherboard/dimm10",
+        "endpoints":
+        [
+            {
+                "types":
+                {
+                    "rType": "inventory",
+                    "fType": "sensors"
+                },
+                "paths":
+                [
+                    "/xyz/openbmc_project/sensors/temperature/dimm10_temp"
+                ]
+            }
+        ]
+    },
+    {
+        "path": "system/chassis/motherboard/dimm11",
+        "endpoints":
+        [
+            {
+                "types":
+                {
+                    "rType": "inventory",
+                    "fType": "sensors"
+                },
+                "paths":
+                [
+                    "/xyz/openbmc_project/sensors/temperature/dimm11_temp"
+                ]
+            }
+        ]
+    },
+    {
+        "path": "system/chassis/motherboard/dimm12",
+        "endpoints":
+        [
+            {
+                "types":
+                {
+                    "rType": "inventory",
+                    "fType": "sensors"
+                },
+                "paths":
+                [
+                    "/xyz/openbmc_project/sensors/temperature/dimm12_temp"
+                ]
+            }
+        ]
+    },
+    {
+        "path": "system/chassis/motherboard/dimm13",
+        "endpoints":
+        [
+            {
+                "types":
+                {
+                    "rType": "inventory",
+                    "fType": "sensors"
+                },
+                "paths":
+                [
+                    "/xyz/openbmc_project/sensors/temperature/dimm13_temp"
+                ]
+            }
+        ]
+    },
+    {
+        "path": "system/chassis/motherboard/dimm14",
+        "endpoints":
+        [
+            {
+                "types":
+                {
+                    "rType": "inventory",
+                    "fType": "sensors"
+                },
+                "paths":
+                [
+                    "/xyz/openbmc_project/sensors/temperature/dimm14_temp"
+                ]
+            }
+        ]
+    },
+    {
+        "path": "system/chassis/motherboard/dimm15",
+        "endpoints":
+        [
+            {
+                "types":
+                {
+                    "rType": "inventory",
+                    "fType": "sensors"
+                },
+                "paths":
+                [
+                    "/xyz/openbmc_project/sensors/temperature/dimm15_temp"
+                ]
+            }
+        ]
+    },
+    {
+        "path": "system/chassis/motherboard/dimm16",
+        "endpoints":
+        [
+            {
+                "types":
+                {
+                    "rType": "inventory",
+                    "fType": "sensors"
+                },
+                "paths":
+                [
+                    "/xyz/openbmc_project/sensors/temperature/dimm16_temp"
+                ]
+            }
+        ]
+    },
+    {
+        "path": "system/chassis/motherboard/dimm17",
+        "endpoints":
+        [
+            {
+                "types":
+                {
+                    "rType": "inventory",
+                    "fType": "sensors"
+                },
+                "paths":
+                [
+                    "/xyz/openbmc_project/sensors/temperature/dimm17_temp"
+                ]
+            }
+        ]
+    },
+    {
+        "path": "system/chassis/motherboard/dimm18",
+        "endpoints":
+        [
+            {
+                "types":
+                {
+                    "rType": "inventory",
+                    "fType": "sensors"
+                },
+                "paths":
+                [
+                    "/xyz/openbmc_project/sensors/temperature/dimm18_temp"
+                ]
+            }
+        ]
+    },
+    {
+        "path": "system/chassis/motherboard/dimm19",
+        "endpoints":
+        [
+            {
+                "types":
+                {
+                    "rType": "inventory",
+                    "fType": "sensors"
+                },
+                "paths":
+                [
+                    "/xyz/openbmc_project/sensors/temperature/dimm19_temp"
+                ]
+            }
+        ]
+    },
+    {
+        "path": "system/chassis/motherboard/dimm20",
+        "endpoints":
+        [
+            {
+                "types":
+                {
+                    "rType": "inventory",
+                    "fType": "sensors"
+                },
+                "paths":
+                [
+                    "/xyz/openbmc_project/sensors/temperature/dimm20_temp"
+                ]
+            }
+        ]
+    },
+    {
+        "path": "system/chassis/motherboard/dimm21",
+        "endpoints":
+        [
+            {
+                "types":
+                {
+                    "rType": "inventory",
+                    "fType": "sensors"
+                },
+                "paths":
+                [
+                    "/xyz/openbmc_project/sensors/temperature/dimm21_temp"
+                ]
+            }
+        ]
+    },
+    {
+        "path": "system/chassis/motherboard/dimm22",
+        "endpoints":
+        [
+            {
+                "types":
+                {
+                    "rType": "inventory",
+                    "fType": "sensors"
+                },
+                "paths":
+                [
+                    "/xyz/openbmc_project/sensors/temperature/dimm22_temp"
+                ]
+            }
+        ]
+    },
+    {
+        "path": "system/chassis/motherboard/dimm23",
+        "endpoints":
+        [
+            {
+                "types":
+                {
+                    "rType": "inventory",
+                    "fType": "sensors"
+                },
+                "paths":
+                [
+                    "/xyz/openbmc_project/sensors/temperature/dimm23_temp"
                 ]
             }
         ]
@@ -272,15 +686,15 @@
                     "/xyz/openbmc_project/sensors/power/p1_vccio_vr_pin",
                     "/xyz/openbmc_project/sensors/power/p1_vccio_vr_pout",
                     "/xyz/openbmc_project/sensors/current/p0_dimm_vr0_current",
-                    "/xyz/openbmc_project/sensors/current/p0_dimm_vr0_lin",
+                    "/xyz/openbmc_project/sensors/current/p0_dimm_vr0_iin",
                     "/xyz/openbmc_project/sensors/current/p0_dimm_vr1_current",
-                    "/xyz/openbmc_project/sensors/current/p0_dimm_vr1_lin",
+                    "/xyz/openbmc_project/sensors/current/p0_dimm_vr1_iin",
                     "/xyz/openbmc_project/sensors/current/p0_vccin_vr_current",
                     "/xyz/openbmc_project/sensors/current/p0_vccio_vr_current",
                     "/xyz/openbmc_project/sensors/current/p1_dimm_vr0_current",
-                    "/xyz/openbmc_project/sensors/current/p1_dimm_vr0_lin",
+                    "/xyz/openbmc_project/sensors/current/p1_dimm_vr0_iin",
                     "/xyz/openbmc_project/sensors/current/p1_dimm_vr1_current",
-                    "/xyz/openbmc_project/sensors/current/p1_dimm_vr1_lin",
+                    "/xyz/openbmc_project/sensors/current/p1_dimm_vr1_iin",
                     "/xyz/openbmc_project/sensors/current/p1_vccin_vr_current",
                     "/xyz/openbmc_project/sensors/current/p1_vccio_vr_current",
                     "/xyz/openbmc_project/sensors/fan_tach/fan1",
@@ -308,21 +722,49 @@
                     "/xyz/openbmc_project/sensors/voltage/ps1_input_voltage",
                     "/xyz/openbmc_project/sensors/current/ps1_output_current",
                     "/xyz/openbmc_project/sensors/voltage/ps1_output_voltage",
-                    "/xyz/openbmc_project/sensors/temperature/Core_0_CPU1",
-                    "/xyz/openbmc_project/sensors/temperature/Core_1_CPU1",
-                    "/xyz/openbmc_project/sensors/temperature/Core_2_CPU1",
-                    "/xyz/openbmc_project/sensors/temperature/Core_3_CPU1",
-                    "/xyz/openbmc_project/sensors/temperature/Core_4_CPU1",
-                    "/xyz/openbmc_project/sensors/temperature/Core_5_CPU1",
-                    "/xyz/openbmc_project/sensors/temperature/Core_0_CPU0",
-                    "/xyz/openbmc_project/sensors/temperature/Core_1_CPU0",
-                    "/xyz/openbmc_project/sensors/temperature/Core_2_CPU0",
-                    "/xyz/openbmc_project/sensors/temperature/Core_3_CPU0",
-                    "/xyz/openbmc_project/sensors/temperature/Core_4_CPU0",
-                    "/xyz/openbmc_project/sensors/temperature/Core_5_CPU0",
-                    "/xyz/openbmc_project/sensors/temperature/DIMM_C1_CPU0",
-                    "/xyz/openbmc_project/sensors/temperature/Die_CPU0",
-                    "/xyz/openbmc_project/sensors/temperature/Die_CPU1"
+                    "/xyz/openbmc_project/sensors/temperature/cpu1_core0_temp",
+                    "/xyz/openbmc_project/sensors/temperature/cpu1_core1_temp",
+                    "/xyz/openbmc_project/sensors/temperature/cpu1_core2_temp",
+                    "/xyz/openbmc_project/sensors/temperature/cpu1_core3_temp",
+                    "/xyz/openbmc_project/sensors/temperature/cpu1_core4_temp",
+                    "/xyz/openbmc_project/sensors/temperature/cpu1_core5_temp",
+                    "/xyz/openbmc_project/sensors/temperature/cpu0_core0_temp",
+                    "/xyz/openbmc_project/sensors/temperature/cpu0_core1_temp",
+                    "/xyz/openbmc_project/sensors/temperature/cpu0_core2_temp",
+                    "/xyz/openbmc_project/sensors/temperature/cpu0_core3_temp",
+                    "/xyz/openbmc_project/sensors/temperature/cpu0_core4_temp",
+                    "/xyz/openbmc_project/sensors/temperature/cpu0_core5_temp",
+                    "/xyz/openbmc_project/sensors/temperature/dimm0_temp",
+                    "/xyz/openbmc_project/sensors/temperature/dimm1_temp",
+                    "/xyz/openbmc_project/sensors/temperature/dimm2_temp",
+                    "/xyz/openbmc_project/sensors/temperature/dimm3_temp",
+                    "/xyz/openbmc_project/sensors/temperature/dimm4_temp",
+                    "/xyz/openbmc_project/sensors/temperature/dimm5_temp",
+                    "/xyz/openbmc_project/sensors/temperature/dimm6_temp",
+                    "/xyz/openbmc_project/sensors/temperature/dimm7_temp",
+                    "/xyz/openbmc_project/sensors/temperature/dimm8_temp",
+                    "/xyz/openbmc_project/sensors/temperature/dimm9_temp",
+                    "/xyz/openbmc_project/sensors/temperature/dimm10_temp",
+                    "/xyz/openbmc_project/sensors/temperature/dimm11_temp",
+                    "/xyz/openbmc_project/sensors/temperature/dimm12_temp",
+                    "/xyz/openbmc_project/sensors/temperature/dimm13_temp",
+                    "/xyz/openbmc_project/sensors/temperature/dimm14_temp",
+                    "/xyz/openbmc_project/sensors/temperature/dimm15_temp",
+                    "/xyz/openbmc_project/sensors/temperature/dimm16_temp",
+                    "/xyz/openbmc_project/sensors/temperature/dimm17_temp",
+                    "/xyz/openbmc_project/sensors/temperature/dimm18_temp",
+                    "/xyz/openbmc_project/sensors/temperature/dimm19_temp",
+                    "/xyz/openbmc_project/sensors/temperature/dimm20_temp",
+                    "/xyz/openbmc_project/sensors/temperature/dimm21_temp",
+                    "/xyz/openbmc_project/sensors/temperature/dimm22_temp",
+                    "/xyz/openbmc_project/sensors/temperature/dimm23_temp",
+                    "/xyz/openbmc_project/sensors/temperature/cpu0_die_temp",
+                    "/xyz/openbmc_project/sensors/temperature/cpu1_die_temp",
+                    "/xyz/openbmc_project/sensors/current/hotswap_iout",
+                    "/xyz/openbmc_project/sensors/power/hotswap_pout",
+                    "/xyz/openbmc_project/sensors/temperature/hotswap_temp",
+                    "/xyz/openbmc_project/sensors/voltage/hotswap_vin",
+                    "/xyz/openbmc_project/sensors/voltage/hotswap_vout"
                 ]
             }
         ]
diff --git a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/adc@c000.conf b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/adc@c000.conf
index 0a91f05..353fa78 100644
--- a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/adc@c000.conf
+++ b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/adc@c000.conf
@@ -4,6 +4,9 @@
 WARNLO_in1 = "3066"
 CRITHI_in1 = "3647"
 CRITLO_in1 = "2097"
+MINVALUE_in1 = "0"
+MAXVALUE_in1 = "4"
+PWRONMON_in1 = "ON"
 
 LABEL_in2 = "P5V"
 GAIN_in2=3.68
@@ -11,6 +14,9 @@
 WARNLO_in2 = "4500"
 CRITHI_in2 = "5700"
 CRITLO_in2 = "4000"
+MINVALUE_in2 = "0"
+MAXVALUE_in2 = "6"
+PWRONMON_in2 = "ON"
 
 LABEL_in3 = "P3V3_STBY"
 GAIN_in3=2.435
@@ -18,6 +24,8 @@
 WARNLO_in3 = "3066"
 CRITHI_in3 = "3647"
 CRITLO_in3 = "2097"
+MINVALUE_in3 = "0"
+MAXVALUE_in3 = "4"
 
 LABEL_in4 = "P5V_STBY"
 GAIN_in4=3.68
@@ -25,12 +33,16 @@
 WARNLO_in4 = "4500"
 CRITHI_in4 = "5700"
 CRITLO_in4 = "4000"
+MINVALUE_in4 = "0"
+MAXVALUE_in4 = "6"
 
 LABEL_in6 = "PVNN_STBY_PCH"
 WARNHI_in6 = "1050"
 WARNLO_in6 = "945"
 CRITHI_in6 = "1100"
 CRITLO_in6 = "916"
+MINVALUE_in6 = "0"
+MAXVALUE_in6 = "2"
 
 LABEL_in7 = "P12V_STBY"
 GAIN_in7=8.9
@@ -38,9 +50,13 @@
 WARNLO_in7 = "10945"
 CRITHI_in7 = "13494"
 CRITLO_in7 = "10616"
+MINVALUE_in7 = "0"
+MAXVALUE_in7 = "14"
 
 LABEL_in8 = "P1V05_STBY_PCH"
 WARNHI_in8 = "1106"
 WARNLO_in8 = "995"
 CRITHI_in8 = "1139"
 CRITLO_in8 = "966"
+MINVALUE_in8 = "0"
+MAXVALUE_in8 = "2"
\ No newline at end of file
diff --git a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@82000/power-supply@58.conf b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@82000/power-supply@58.conf
index eb47c3c..eda3948 100644
--- a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@82000/power-supply@58.conf
+++ b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@82000/power-supply@58.conf
@@ -3,32 +3,39 @@
 WARNLO_temp1 = "0"
 CRITHI_temp1 = "100000"
 CRITLO_temp1 = "0"
+MINVALUE_temp1 = "-128"
+MAXVALUE_temp1 = "127"
 
 LABEL_in1= "ps0_input_voltage"
-WARNHI_in1="290000"
+WARNHI_in1="235000"
 WARNLO_in1="200000"
-CRITHI_in1="300000"
+CRITHI_in1="240000"
 CRITLO_in1="180000"
+MINVALUE_in1 = "0"
+MAXVALUE_in1 = "255"
 
 LABEL_in2= "ps0_output_voltage"
 WARNHI_in2="12700"
 WARNLO_in2="0"
 CRITHI_in2="13000"
 CRITLO_in2="0"
+MINVALUE_in2 = "0"
+MAXVALUE_in2 = "13"
 
 LABEL_power1= "ps0_input_power"
 WARNHI_power1="950000000"
 WARNLO_power1="0"
 CRITHI_power1="1000000000"
 CRITLO_power1="0"
+MINVALUE_power1 = "0"
+MAXVALUE_power1 = "1100"
 
 LABEL_power2= "ps0_output_power"
 WARNHI_power2="950000000"
 WARNLO_power2="0"
 CRITHI_power2="1000000000"
 CRITLO_power2="0"
-
-LABEL_fan1= "ps0_fan1"
-LABEL_fan2= "ps0_fan2"
+MINVALUE_power2 = "0"
+MAXVALUE_power2 = "1100"
 
 INTERVAL=10000000
diff --git a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@82000/tmp421@4c.conf b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@82000/tmp421@4c.conf
index a7430a7..7ea7d57 100644
--- a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@82000/tmp421@4c.conf
+++ b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@82000/tmp421@4c.conf
@@ -1,5 +1,7 @@
-LABEL_temp1 = "inlet"
+LABEL_temp1 = "outlet"
 WARNHI_temp1 = "110000"
 WARNLO_temp1 = "5000"
 CRITHI_temp1 = "115000"
 CRITLO_temp1 = "0"
+MINVALUE_temp1 = "-128"
+MAXVALUE_temp1 = "127"
\ No newline at end of file
diff --git a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/ina219@40.conf b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/ina219@40.conf
index 2073266..f0dea45 100644
--- a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/ina219@40.conf
+++ b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/ina219@40.conf
@@ -1,5 +1,3 @@
-LABEL_curr1 = "p0_dimm_vr0_lin"
-WARNHI_curr1 = "231000"
-CRITHI_curr1 = "288000"
-WARNLO_curr1 = "0"
-CRITLO_curr1 = "0"
+LABEL_curr1 = "p0_dimm_vr0_iin"
+GAIN_curr1 = "1000.0"
+PWRONMON_curr1 = "ON"
\ No newline at end of file
diff --git a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/ina219@41.conf b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/ina219@41.conf
index c01aab8..b960d5e 100644
--- a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/ina219@41.conf
+++ b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/ina219@41.conf
@@ -1,5 +1,3 @@
-LABEL_curr1 = "p0_dimm_vr1_lin"
-WARNHI_curr1 = "231000"
-CRITHI_curr1 = "288000"
-WARNLO_curr1 = "0"
-CRITLO_curr1 = "0"
+LABEL_curr1 = "p0_dimm_vr1_iin"
+GAIN_curr1 = "1000.0"
+PWRONMON_curr1 = "ON"
\ No newline at end of file
diff --git a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/ina219@44.conf b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/ina219@44.conf
index 3cc3824..bc74772 100644
--- a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/ina219@44.conf
+++ b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/ina219@44.conf
@@ -1,5 +1,3 @@
-LABEL_curr1 = "p1_dimm_vr0_lin"
-WARNHI_curr1 = "231000"
-CRITHI_curr1 = "288000"
-WARNLO_curr1 = "0"
-CRITLO_curr1 = "0"
+LABEL_curr1 = "p1_dimm_vr0_iin"
+GAIN_curr1 = "1000.0"
+PWRONMON_curr1 = "ON"
\ No newline at end of file
diff --git a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/ina219@45.conf b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/ina219@45.conf
index 5384422..92df9a8 100644
--- a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/ina219@45.conf
+++ b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/ina219@45.conf
@@ -1,5 +1,3 @@
-LABEL_curr1 = "p1_dimm_vr1_lin"
-WARNHI_curr1 = "231000"
-CRITHI_curr1 = "288000"
-WARNLO_curr1 = "0"
-CRITLO_curr1 = "0"
+LABEL_curr1 = "p1_dimm_vr1_iin"
+GAIN_curr1 = "1000.0"
+PWRONMON_curr1 = "ON"
\ No newline at end of file
diff --git a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/tps53622@67.conf b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/tps53622@67.conf
index 7b27a4c..c8e2dd6 100644
--- a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/tps53622@67.conf
+++ b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/tps53622@67.conf
@@ -3,19 +3,30 @@
 CRITHI_temp1 = "115000"
 WARNLO_temp1 = "0"
 CRITLO_temp1 = "0"
+MINVALUE_temp1 = "-128"
+MAXVALUE_temp1 = "127"
+PWRONMON_temp1 = "ON"
 
 LABEL_curr1 = "p0_vccio_vr_current"
 WARNHI_curr1 = "231000"
 CRITHI_curr1 = "288000"
 WARNLO_curr1 = "0"
 CRITLO_curr1 = "0"
+MINVALUE_curr1 = "0"
+MAXVALUE_curr1 = "300"
+PWRONMON_curr1 = "ON"
 
 LABEL_in1 = "p0_vccio_vr_voltage"
-WARNHI_in1 = "16000"
-WARNLO_in1 = "11000"
-CRITLO_in1 = "9500"
-CRITHI_in1 = "17000"
+CRITHI_in1 = "12600"
+CRITLO_in1 = "11400"
+WARNHI_in1 = "12600"
+WARNLO_in1 = "11400"
+MINVALUE_in1 = "0"
+MAXVALUE_in1 = "13"
+PWRONMON_in1 = "ON"
 
 LABEL_power1 = "p0_vccio_vr_pin"
+PWRONMON_power1 = "ON"
 
 LABEL_power2 = "p0_vccio_vr_pout"
+PWRONMON_power2 = "ON"
\ No newline at end of file
diff --git a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/tps53622@77.conf b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/tps53622@77.conf
index b4d46de..98641e2 100644
--- a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/tps53622@77.conf
+++ b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/tps53622@77.conf
@@ -3,19 +3,30 @@
 CRITHI_temp1 = "115000"
 WARNLO_temp1 = "0"
 CRITLO_temp1 = "0"
+MINVALUE_temp1 = "-128"
+MAXVALUE_temp1 = "127"
+PWRONMON_temp1 = "ON"
 
 LABEL_curr1 = "p1_vccio_vr_current"
 WARNHI_curr1 = "231000"
 CRITHI_curr1 = "288000"
 WARNLO_curr1 = "0"
 CRITLO_curr1 = "0"
+MINVALUE_curr1 = "0"
+MAXVALUE_curr1 = "300"
+PWRONMON_curr1 = "ON"
 
 LABEL_in1 = "p1_vccio_vr_voltage"
-WARNHI_in1 = "16000"
-WARNLO_in1 = "11000"
-CRITLO_in1 = "9500"
-CRITHI_in1 = "17000"
+CRITHI_in1 = "12600"
+CRITLO_in1 = "11400"
+WARNHI_in1 = "12600"
+WARNLO_in1 = "11400"
+MINVALUE_in1 = "0"
+MAXVALUE_in1 = "13"
+PWRONMON_in1 = "ON"
 
 LABEL_power1 = "p1_vccio_vr_pin"
+PWRONMON_power1 = "ON"
 
 LABEL_power2 = "p1_vccio_vr_pout"
+PWRONMON_power2 = "ON"
\ No newline at end of file
diff --git a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/tps53659@62.conf b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/tps53659@62.conf
index 3c10f9c..0a46d3a 100644
--- a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/tps53659@62.conf
+++ b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/tps53659@62.conf
@@ -3,19 +3,30 @@
 CRITHI_temp1 = "115000"
 WARNLO_temp1 = "0"
 CRITLO_temp1 = "0"
+MINVALUE_temp1 = "-128"
+MAXVALUE_temp1 = "127"
+PWRONMON_temp1 = "ON"
 
 LABEL_curr1 = "p0_dimm_vr0_current"
-WARNHI_curr1 = "231000"
-CRITHI_curr1 = "288000"
+WARNHI_curr1 = "65000"
+CRITHI_curr1 = "70000"
 WARNLO_curr1 = "0"
 CRITLO_curr1 = "0"
+MINVALUE_curr1 = "0"
+MAXVALUE_curr1 = "76"
+PWRONMON_curr1 = "ON"
 
 LABEL_in1 = "p0_dimm_vr0_voltage"
-WARNHI_in1 = "16000"
-WARNLO_in1 = "11000"
-CRITLO_in1 = "9500"
-CRITHI_in1 = "17000"
+CRITHI_in1 = "12600"
+CRITLO_in1 = "11400"
+WARNHI_in1 = "12600"
+WARNLO_in1 = "11400"
+MINVALUE_in1 = "0"
+MAXVALUE_in1 = "13"
+PWRONMON_in1 = "ON"
 
 LABEL_power1 = "p0_dimm_vr0_pin"
+PWRONMON_power1 = "ON"
 
 LABEL_power2 = "p0_dimm_vr0_pout"
+PWRONMON_power2 = "ON"
\ No newline at end of file
diff --git a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/tps53659@64.conf b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/tps53659@64.conf
index 55bce3f..9c8921f 100644
--- a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/tps53659@64.conf
+++ b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/tps53659@64.conf
@@ -3,19 +3,30 @@
 CRITHI_temp1 = "115000"
 WARNLO_temp1 = "0"
 CRITLO_temp1 = "0"
+MINVALUE_temp1 = "-128"
+MAXVALUE_temp1 = "127"
+PWRONMON_temp1 = "ON"
 
 LABEL_curr1 = "p0_dimm_vr1_current"
-WARNHI_curr1 = "231000"
-CRITHI_curr1 = "288000"
+WARNHI_curr1 = "65000"
+CRITHI_curr1 = "70000"
 WARNLO_curr1 = "0"
 CRITLO_curr1 = "0"
+MINVALUE_curr1 = "0"
+MAXVALUE_curr1 = "76"
+PWRONMON_curr1 = "ON"
 
 LABEL_in1 = "p0_dimm_vr1_voltage"
-WARNHI_in1 = "16000"
-WARNLO_in1 = "11000"
-CRITLO_in1 = "9500"
-CRITHI_in1 = "17000"
+CRITHI_in1 = "12600"
+CRITLO_in1 = "11400"
+WARNHI_in1 = "12600"
+WARNLO_in1 = "11400"
+MINVALUE_in1 = "0"
+MAXVALUE_in1 = "13"
+PWRONMON_in1 = "ON"
 
 LABEL_power1 = "p0_dimm_vr1_pin"
+PWRONMON_power1 = "ON"
 
 LABEL_power2 = "p0_dimm_vr1_pout"
+PWRONMON_power2 = "ON"
\ No newline at end of file
diff --git a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/tps53659@72.conf b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/tps53659@72.conf
index 75c9b4e..cf218f0 100644
--- a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/tps53659@72.conf
+++ b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/tps53659@72.conf
@@ -3,19 +3,30 @@
 CRITHI_temp1 = "115000"
 WARNLO_temp1 = "0"
 CRITLO_temp1 = "0"
+MINVALUE_temp1 = "-128"
+MAXVALUE_temp1 = "127"
+PWRONMON_temp1 = "ON"
 
 LABEL_curr1 = "p1_dimm_vr0_current"
-WARNHI_curr1 = "231000"
-CRITHI_curr1 = "288000"
+WARNHI_curr1 = "65000"
+CRITHI_curr1 = "70000"
 WARNLO_curr1 = "0"
 CRITLO_curr1 = "0"
+MINVALUE_curr1 = "0"
+MAXVALUE_curr1 = "76"
+PWRONMON_curr1 = "ON"
 
 LABEL_in1 = "p1_dimm_vr0_voltage"
-WARNHI_in1 = "16000"
-WARNLO_in1 = "11000"
-CRITLO_in1 = "9500"
-CRITHI_in1 = "17000"
+CRITHI_in1 = "12600"
+CRITLO_in1 = "11400"
+WARNHI_in1 = "12600"
+WARNLO_in1 = "11400"
+MINVALUE_in1 = "0"
+MAXVALUE_in1 = "13"
+PWRONMON_in1 = "ON"
 
 LABEL_power1 = "p1_dimm_vr0_pin"
+PWRONMON_power1 = "ON"
 
 LABEL_power2 = "p1_dimm_vr0_pout"
+PWRONMON_power2 = "ON"
\ No newline at end of file
diff --git a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/tps53659@74.conf b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/tps53659@74.conf
index 249e61d..cc1df6c 100644
--- a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/tps53659@74.conf
+++ b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/tps53659@74.conf
@@ -3,19 +3,29 @@
 CRITHI_temp1 = "115000"
 WARNLO_temp1 = "0"
 CRITLO_temp1 = "0"
+MINVALUE_temp1 = "-128"
+MAXVALUE_temp1 = "127"
+PWRONMON_temp1 = "ON"
 
 LABEL_curr1 = "p1_dimm_vr1_current"
-WARNHI_curr1 = "231000"
-CRITHI_curr1 = "288000"
+WARNHI_curr1 = "65000"
+CRITHI_curr1 = "70000"
 WARNLO_curr1 = "0"
 CRITLO_curr1 = "0"
+MINVALUE_curr1 = "0"
+MAXVALUE_curr1 = "76"
+PWRONMON_curr1 = "ON"
 
 LABEL_in1 = "p1_dimm_vr1_voltage"
-WARNHI_in1 = "16000"
-WARNLO_in1 = "11000"
-CRITLO_in1 = "9500"
-CRITHI_in1 = "17000"
+CRITHI_in1 = "12600"
+CRITLO_in1 = "11400"
+WARNHI_in1 = "12600"
+WARNLO_in1 = "11400"
+MINVALUE_in1 = "0"
+MAXVALUE_in1 = "13"
 
 LABEL_power1 = "p1_dimm_vr1_pin"
+PWRONMON_power1 = "ON"
 
 LABEL_power2 = "p1_dimm_vr1_pout"
+PWRONMON_power2 = "ON"
\ No newline at end of file
diff --git a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/tps53679@60.conf b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/tps53679@60.conf
index 7ef3664..48cb44e 100644
--- a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/tps53679@60.conf
+++ b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/tps53679@60.conf
@@ -3,19 +3,30 @@
 CRITHI_temp1 = "115000"
 WARNLO_temp1 = "0"
 CRITLO_temp1 = "0"
+MINVALUE_temp1 = "-128"
+MAXVALUE_temp1 = "127"
+PWRONMON_temp1 = "ON"
 
 LABEL_curr1 = "p0_vccin_vr_current"
-WARNHI_curr1 = "231000"
-CRITHI_curr1 = "288000"
+WARNHI_curr1 = "200000"
+CRITHI_curr1 = "231000"
 WARNLO_curr1 = "0"
 CRITLO_curr1 = "0"
+MINVALUE_curr1 = "0"
+MAXVALUE_curr1 = "255"
+PWRONMON_curr1 = "ON"
 
 LABEL_in1 = "p0_vccin_vr_voltage"
-WARNHI_in1 = "16000"
-WARNLO_in1 = "11000"
-CRITLO_in1 = "9500"
-CRITHI_in1 = "17000"
+CRITHI_in1 = "12600"
+CRITLO_in1 = "11400"
+WARNHI_in1 = "12600"
+WARNLO_in1 = "11400"
+MINVALUE_in1 = "0"
+MAXVALUE_in1 = "13"
+PWRONMON_in1 = "ON"
 
 LABEL_power1 = "p0_vccin_vr_pin"
+PWRONMON_power1 = "ON"
 
 LABEL_power2 = "p0_vccin_vr_pout"
+PWRONMON_power2 = "ON"
\ No newline at end of file
diff --git a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/tps53679@70.conf b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/tps53679@70.conf
index 611b107..dad4b74 100644
--- a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/tps53679@70.conf
+++ b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@86000/tps53679@70.conf
@@ -3,19 +3,30 @@
 CRITHI_temp1 = "115000"
 WARNLO_temp1 = "0"
 CRITLO_temp1 = "0"
+MINVALUE_temp1 = "-128"
+MAXVALUE_temp1 = "127"
+PWRONMON_temp1 = "ON"
 
 LABEL_curr1 = "p1_vccin_vr_current"
-WARNHI_curr1 = "231000"
-CRITHI_curr1 = "288000"
+WARNHI_curr1 = "200000"
+CRITHI_curr1 = "231000"
 WARNLO_curr1 = "0"
 CRITLO_curr1 = "0"
+MINVALUE_curr1 = "0"
+MAXVALUE_curr1 = "255"
+PWRONMON_curr1 = "ON"
 
 LABEL_in1 = "p1_vccin_vr_voltage"
-WARNHI_in1 = "16000"
-WARNLO_in1 = "11000"
-CRITLO_in1 = "9500"
-CRITHI_in1 = "17000"
+CRITHI_in1 = "12600"
+CRITLO_in1 = "11400"
+WARNHI_in1 = "12600"
+WARNLO_in1 = "11400"
+MINVALUE_in1 = "0"
+MAXVALUE_in1 = "13"
+PWRONMON_in1 = "ON"
 
 LABEL_power1 = "p1_vccin_vr_pin"
+PWRONMON_power1 = "ON"
 
 LABEL_power2 = "p1_vccin_vr_pout"
+PWRONMON_power2 = "ON"
\ No newline at end of file
diff --git a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@87000/tmp421@4c.conf b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@87000/tmp421@4c.conf
index 3afeef7..775d70d 100644
--- a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@87000/tmp421@4c.conf
+++ b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@87000/tmp421@4c.conf
@@ -1,5 +1,7 @@
-LABEL_temp1 = "outlet"
+LABEL_temp1 = "inlet"
 WARNHI_temp1 = "110000"
 WARNLO_temp1 = "5000"
 CRITHI_temp1 = "115000"
 CRITLO_temp1 = "0"
+MINVALUE_temp1 = "-128"
+MAXVALUE_temp1 = "127"
\ No newline at end of file
diff --git a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@88000/adm1278@11.conf b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@88000/adm1278@11.conf
index 84bce0d..3b7c6c2 100644
--- a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@88000/adm1278@11.conf
+++ b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@88000/adm1278@11.conf
@@ -1,9 +1,39 @@
-LABEL_temp1 = "MB0_Temp"
-WARNLO_temp1= "5000"
-WARNHI_temp1= "50000"
-CRITHI_temp1 = "60000"
+LABEL_curr1= "hotswap_iout"
+CRITHI_curr1= "23000"
+CRITLO_curr1= "0"
+WARNHI_curr1= "20000"
+WARNLO_curr1= "0"
+MINVALUE_curr1 = "0"
+MAXVALUE_curr1 = "25"
+
+LABEL_power1= "hotswap_pout"
+CRITHI_power1= "900000000"
+CRITLO_power1= "0"
+WARNHI_power1= "900000000"
+WARNLO_power1= "0"
+MINVALUE_power1 = "0"
+MAXVALUE_power1 = "1000"
+
+LABEL_in1 = "hotswap_vin"
+CRITHI_in1 = "13000"
+CRITLO_in1 = "10000"
+WARNHI_in1 = "13000"
+WARNLO_in1 = "10000"
+MINVALUE_in1 = "0"
+MAXVALUE_in1 = "13"
+
+LABEL_in2 = "hotswap_vout"
+CRITHI_in2 = "13000"
+CRITLO_in2 = "10000"
+WARNHI_in2 = "13000"
+WARNLO_in2 = "10000"
+MINVALUE_in2 = "0"
+MAXVALUE_in2 = "13"
+
+LABEL_temp1 = "hotswap_temp"
+WARNHI_temp1 = "110000"
+WARNLO_temp1 = "5000"
+CRITHI_temp1 = "115000"
 CRITLO_temp1 = "0"
-LABEL_curr1 = "MB0_Iout"
-LABEL_in1 = "MB0_Vin"
-LABEL_in2 = "MB0_Vout"
-LABEL_power1 = "MB0_Pin"
+MINVALUE_temp1 = "-128"
+MAXVALUE_temp1 = "127"
\ No newline at end of file
diff --git a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8d000/tmp75@4a.conf b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8d000/tmp75@4a.conf
index 7cf67cb..f812314 100644
--- a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8d000/tmp75@4a.conf
+++ b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8d000/tmp75@4a.conf
@@ -3,3 +3,5 @@
 WARNLO_temp1 = "5000"
 CRITHI_temp1 = "115000"
 CRITLO_temp1 = "0"
+MINVALUE_temp1 = "-128"
+MAXVALUE_temp1 = "127"
\ No newline at end of file
diff --git a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-fan-controller@103000.conf b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-fan-controller@103000.conf
index 9ffe5bf..9f78280 100644
--- a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-fan-controller@103000.conf
+++ b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-fan-controller@103000.conf
@@ -7,6 +7,7 @@
 MINVALUE_fan1 = "0"
 MAXVALUE_fan1 = "20145"
 PWM_TARGET_fan1 = 1
+PWRONMON_fan1 = "ON"
 
 LABEL_fan2= "fan2"
 TARGET_fan2= "fan2"
@@ -17,6 +18,7 @@
 MINVALUE_fan2 = "0"
 MAXVALUE_fan2 = "20145"
 PWM_TARGET_fan2 = 1
+PWRONMON_fan2 = "ON"
 
 LABEL_fan3= "fan3"
 TARGET_fan3= "fan3"
@@ -27,6 +29,7 @@
 MINVALUE_fan3 = "0"
 MAXVALUE_fan3 = "20145"
 PWM_TARGET_fan3 = 1
+PWRONMON_fan3 = "ON"
 
 LABEL_fan4= "fan4"
 TARGET_fan4= "fan4"
@@ -37,6 +40,7 @@
 MINVALUE_fan4 = "0"
 MAXVALUE_fan4 = "20145"
 PWM_TARGET_fan4 = 1
+PWRONMON_fan4 = "ON"
 
 LABEL_fan5= "fan5"
 TARGET_fan5= "fan5"
@@ -47,6 +51,7 @@
 MINVALUE_fan5 = "0"
 MAXVALUE_fan5 = "20145"
 PWM_TARGET_fan5 = 1
+PWRONMON_fan5 = "ON"
 
 LABEL_fan6= "fan6"
 TARGET_fan6= "fan6"
@@ -57,3 +62,4 @@
 MINVALUE_fan6 = "0"
 MAXVALUE_fan6 = "20145"
 PWM_TARGET_fan6 = 1
+PWRONMON_fan6 = "ON"
\ 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-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"
diff --git a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index 938bfb6..2527435 100644
--- a/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -31,8 +31,9 @@
         peci-0/0-30/peci-cputemp.0 \
         peci-0/0-31/peci-cputemp.1\
         peci-0/0-30/peci-dimmtemp.0 \
+        peci-0/0-31/peci-dimmtemp.1 \
         "
-PECIITEMSFMT = "devices/platform/ahb/ahb--apb/f0100000.peci-bus/{0}.conf"
+PECIITEMSFMT = "devices/platform/ahb/ahb--apb/ahb--apb--peci-bus@100000/f0100000.peci-bus/{0}.conf"
 PECIITEMS = "${@compose_list(d, 'PECIITEMSFMT', 'PECINAMES')}"
 PECIENVS = "obmc/hwmon/{0}"
 SYSTEMD_ENVIRONMENT_FILE_${PN}_append_olympus-nuvoton = " ${@compose_list(d, 'PECIENVS', 'PECIITEMS')}"