diff --git a/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@82000/lm75@5c.conf b/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@82000/lm75@5c.conf
index 9adca0b..179d122 100644
--- a/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@82000/lm75@5c.conf
+++ b/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@82000/lm75@5c.conf
@@ -1,7 +1,7 @@
 LABEL_temp1= "KL1"
 WARNLO_temp1= "5000"
-WARNHI_temp1= "58000"
-CRITHI_temp1 = "60000"
+WARNHI_temp1= "53000"
+CRITHI_temp1 = "56000"
 CRITLO_temp1 = "0"
 MINVALUE_temp1 = "-128"
 MAXVALUE_temp1 = "127"
diff --git a/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@83000/lm75@5c.conf b/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@83000/lm75@5c.conf
index 80f2eb3..4662ed0 100644
--- a/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@83000/lm75@5c.conf
+++ b/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@83000/lm75@5c.conf
@@ -1,7 +1,7 @@
 LABEL_temp1= "KL2"
 WARNLO_temp1= "5000"
 WARNHI_temp1= "58000"
-CRITHI_temp1 = "60000"
+CRITHI_temp1 = "61000"
 CRITLO_temp1 = "0"
 MINVALUE_temp1 = "-128"
 MAXVALUE_temp1 = "127"
diff --git a/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@84000/lm75@5c.conf b/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@84000/lm75@5c.conf
index b586914..d947a41 100644
--- a/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@84000/lm75@5c.conf
+++ b/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@84000/lm75@5c.conf
@@ -1,7 +1,7 @@
 LABEL_temp1= "KL3"
 WARNLO_temp1= "5000"
-WARNHI_temp1= "68000"
-CRITHI_temp1 = "75000"
+WARNHI_temp1= "42000"
+CRITHI_temp1 = "44000"
 CRITLO_temp1 = "0"
 MINVALUE_temp1 = "-128"
 MAXVALUE_temp1 = "127"
diff --git a/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8b000/hotswap@15.conf b/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8b000/hotswap@15.conf
index 5241409..b1dc821 100644
--- a/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8b000/hotswap@15.conf
+++ b/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8b000/hotswap@15.conf
@@ -1,7 +1,7 @@
 LABEL_temp1= "P48V_HSC_Temp"
-WARNHI_temp1= "95000"
+WARNHI_temp1= "60000"
 WARNLO_temp1= "5000"
-CRITHI_temp1= "105000"
+CRITHI_temp1= "65000"
 CRITLO_temp1= "0"
 MINVALUE_temp1 = "-128"
 MAXVALUE_temp1 = "127"
diff --git a/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8b000/power-brick@36.conf b/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8b000/power-brick@36.conf
index 3f7d908..9137742 100644
--- a/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8b000/power-brick@36.conf
+++ b/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8b000/power-brick@36.conf
@@ -1,13 +1,13 @@
 LABEL_temp1= "P12V_BRIC_Temp"
-WARNHI_temp1= "110000"
+WARNHI_temp1= "88000"
 WARNLO_temp1= "5000"
-CRITHI_temp1= "120000"
+CRITHI_temp1= "93000"
 CRITLO_temp1= "0"
 MINVALUE_temp1 = "-128"
 MAXVALUE_temp1 = "127"
 EVENT_temp1 = "WARNHI,WARNLO,CRITHI,CRITLO"
 
-LABEL_curr1= "P12V_BRIC_Current"
+LABEL_curr1= "P12V_BRIC_Curr"
 WARNLO_curr1= "9"
 CRITLO_curr1= "0"
 WARNHI_curr1= "45800"
diff --git a/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/ucd90160@6b.conf b/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/ucd90160@6b.conf
new file mode 100644
index 0000000..5d91da7
--- /dev/null
+++ b/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/ucd90160@6b.conf
@@ -0,0 +1,62 @@
+LABEL_in1= "P3V3_STBY_Vol"
+WARNLO_in1= "3135"
+CRITLO_in1= "3135"
+WARNHI_in1= "3465"
+CRITHI_in1= "3465"
+MINVALUE_in1= "0"
+MAXVALUE_in1= "4"
+EVENT_in1= "WARNHI,WARNLO,CRITHI,CRITLO"
+
+LABEL_in2= "P2V5_BMC_Vol"
+WARNLO_in2= "2375"
+CRITLO_in2= "2375"
+WARNHI_in2= "2625"
+CRITHI_in2= "2625"
+MINVALUE_in2= "0"
+MAXVALUE_in2= "3"
+EVENT_in2= "WARNHI,WARNLO,CRITHI,CRITLO"
+
+LABEL_in3= "P1V8_BMC_Vol"
+WARNLO_in3= "1710"
+CRITLO_in3= "1710"
+WARNHI_in3= "1890"
+CRITHI_in3= "1890"
+MINVALUE_in3= "0"
+MAXVALUE_in3= "2"
+EVENT_in3= "WARNHI,WARNLO,CRITHI,CRITLO"
+
+LABEL_in4= "P1V2_BMC_Vol"
+WARNLO_in4= "1140"
+CRITLO_in4= "1140"
+WARNHI_in4= "1260"
+CRITHI_in4= "1260"
+MINVALUE_in4= "0"
+MAXVALUE_in4= "2"
+EVENT_in4= "WARNHI,WARNLO,CRITHI,CRITLO"
+
+LABEL_in5= "PVTT_BMC_Vol"
+WARNLO_in5= "571"
+CRITLO_in5= "571"
+WARNHI_in5= "626"
+CRITHI_in5= "626"
+MINVALUE_in5= "0"
+MAXVALUE_in5= "1"
+EVENT_in5= "WARNHI,WARNLO,CRITHI,CRITLO"
+
+LABEL_in6= "P1V175_BMC_Vol"
+WARNLO_in6= "1139"
+CRITLO_in6= "1139"
+WARNHI_in6= "1210"
+CRITHI_in6= "1210"
+MINVALUE_in6= "0"
+MAXVALUE_in6= "2"
+EVENT_in6= "WARNHI,WARNLO,CRITHI,CRITLO"
+
+LABEL_in7= "P3V3_PEVPH_Vol"
+WARNLO_in7= "3135"
+CRITLO_in7= "3135"
+WARNHI_in7= "3465"
+CRITHI_in7= "3465"
+MINVALUE_in7= "0"
+MAXVALUE_in7= "4"
+EVENT_in7= "WARNHI,WARNLO,CRITHI,CRITLO"
\ No newline at end of file
diff --git a/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-fan-controller@103000.conf b/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-fan-controller@103000.conf
index 8aace07..9eaee65 100644
--- a/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-fan-controller@103000.conf
+++ b/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-fan-controller@103000.conf
@@ -1,59 +1,65 @@
 LABEL_fan1= "Fan0_0_RPM"
-PWM_TARGET_fan1= "1"
-WARNHI_fan1= "21000"
-WARNLO_fan1= "250"
-CRITHI_fan1= "23000"
-CRITLO_fan1= "250"
+TARGET_fan1= "Fan0_0_RPM"
+WARNHI_fan1= "19000"
+WARNLO_fan1= "230"
+CRITHI_fan1= "20000"
+CRITLO_fan1= "150"
 MINVALUE_fan1 = "0"
-MAXVALUE_fan1 = "25500"
+MAXVALUE_fan1 = "20145"
+PWM_TARGET_fan1 = 1
 EVENT_fan1= "WARNHI,WARNLO,CRITHI,CRITLO"
 
 LABEL_fan2= "Fan0_1_RPM"
-PWM_TARGET_fan2= "1"
-WARNHI_fan2= "21000"
-WARNLO_fan2= "250"
-CRITHI_fan2= "23000"
-CRITLO_fan2= "250"
+TARGET_fan2= "Fan0_1_RPM"
+WARNHI_fan2= "19000"
+WARNLO_fan2= "230"
+CRITHI_fan2= "20000"
+CRITLO_fan2= "150"
 MINVALUE_fan2 = "0"
-MAXVALUE_fan2 = "25500"
+MAXVALUE_fan2 = "20145"
+PWM_TARGET_fan2 = 1
 EVENT_fan2= "WARNHI,WARNLO,CRITHI,CRITLO"
 
 LABEL_fan3= "Fan1_0_RPM"
-PWM_TARGET_fan3= "2"
-WARNHI_fan3= "21000"
-WARNLO_fan3= "250"
-CRITHI_fan3= "23000"
-CRITLO_fan3= "250"
+TARGET_fan3= "Fan1_0_RPM"
+WARNHI_fan3= "19000"
+WARNLO_fan3= "230"
+CRITHI_fan3= "20000"
+CRITLO_fan3= "150"
 MINVALUE_fan3 = "0"
-MAXVALUE_fan3 = "25500"
+MAXVALUE_fan3 = "20145"
+PWM_TARGET_fan3 = 2
 EVENT_fan3= "WARNHI,WARNLO,CRITHI,CRITLO"
 
 LABEL_fan4= "Fan1_1_RPM"
-PWM_TARGET_fan4= "2"
-WARNHI_fan4= "21000"
-WARNLO_fan4= "250"
-CRITHI_fan4= "23000"
-CRITLO_fan4= "250"
+TARGET_fan4= "Fan1_1_RPM"
+WARNHI_fan4= "19000"
+WARNLO_fan4= "230"
+CRITHI_fan4= "20000"
+CRITLO_fan4= "150"
 MINVALUE_fan4 = "0"
-MAXVALUE_fan4 = "25500"
+MAXVALUE_fan4 = "20145"
+PWM_TARGET_fan4 = 2
 EVENT_fan4= "WARNHI,WARNLO,CRITHI,CRITLO"
 
 LABEL_fan5= "Fan2_0_RPM"
-PWM_TARGET_fan5= "3"
-WARNHI_fan5= "21000"
-WARNLO_fan5= "250"
-CRITHI_fan5= "23000"
-CRITLO_fan5= "250"
+TARGET_fan5= "Fan2_0_RPM"
+WARNHI_fan5= "19000"
+WARNLO_fan5= "230"
+CRITHI_fan5= "20000"
+CRITLO_fan5= "150"
 MINVALUE_fan5 = "0"
-MAXVALUE_fan5 = "25500"
+MAXVALUE_fan5 = "20145"
+PWM_TARGET_fan5 = 3
 EVENT_fan5= "WARNHI,WARNLO,CRITHI,CRITLO"
 
 LABEL_fan6= "Fan2_1_RPM"
-PWM_TARGET_fan6= "3"
-WARNHI_fan6= "21000"
-WARNLO_fan6= "250"
-CRITHI_fan6= "23000"
-CRITLO_fan6= "250"
+TARGET_fan6= "Fan2_1_RPM"
+WARNHI_fan6= "19000"
+WARNLO_fan6= "230"
+CRITHI_fan6= "20000"
+CRITLO_fan6= "150"
 MINVALUE_fan6 = "0"
-MAXVALUE_fan6 = "25500"
-EVENT_fan6= "WARNHI,WARNLO,CRITHI,CRITLO"
+MAXVALUE_fan6 = "20145"
+PWM_TARGET_fan6 = 3
+EVENT_fan6= "WARNHI,WARNLO,CRITHI,CRITLO"
\ No newline at end of file
diff --git a/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index bebe062..0313b04 100644
--- a/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -8,6 +8,7 @@
         i2c@84000/lm75@5c  \
         i2c@8b000/hotswap@15 \
         i2c@8b000/power-brick@36 \
+        i2c@8c000/ucd90160@6b \
         "
 ITEMSFMT = "ahb/apb/{0}.conf"