diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/sensors/phosphor-hwmon%.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/sensors/phosphor-hwmon%.bbappend
new file mode 100644
index 0000000..220e891
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/sensors/phosphor-hwmon%.bbappend
@@ -0,0 +1,14 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+NAMES = " \
+        i2c@1e78a000/i2c-bus@140/occ-hwmon@50 \
+        i2c@1e78a000/i2c-bus@180/occ-hwmon@51 \
+        i2c@1e78a000/i2c-bus@400/rtc@68 \
+        "
+
+ITEMSFMT = "ahb/apb/{0}.conf"
+
+ITEMS = "${@compose_list(d, 'ITEMSFMT', 'NAMES')}"
+
+ENVS = "obmc/hwmon/{0}"
+SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}"
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@140/occ-hwmon@50.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@140/occ-hwmon@50.conf
new file mode 100644
index 0000000..71d9952
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@140/occ-hwmon@50.conf
@@ -0,0 +1,78 @@
+MODE_temp1 = "label"
+MODE_temp2 = "label"
+MODE_temp3 = "label"
+MODE_temp4 = "label"
+MODE_temp5 = "label"
+MODE_temp6 = "label"
+MODE_temp7 = "label"
+MODE_temp8 = "label"
+MODE_temp9 = "label"
+MODE_temp10 = "label"
+MODE_temp11 = "label"
+MODE_temp12 = "label"
+MODE_temp13 = "label"
+MODE_temp14 = "label"
+MODE_temp15 = "label"
+MODE_temp16 = "label"
+MODE_temp17 = "label"
+MODE_temp18 = "label"
+MODE_temp19 = "label"
+MODE_temp20 = "label"
+MODE_temp21 = "label"
+MODE_temp22 = "label"
+MODE_temp23 = "label"
+MODE_temp24 = "label"
+MODE_temp25 = "label"
+MODE_temp26 = "label"
+MODE_temp27 = "label"
+MODE_temp28 = "label"
+MODE_temp29 = "label"
+MODE_temp30 = "label"
+MODE_temp31 = "label"
+MODE_temp32 = "label"
+
+LABEL_temp105 = "dimm0"
+LABEL_temp106 = "dimm1"
+LABEL_temp107 = "dimm2"
+LABEL_temp108 = "dimm3"
+LABEL_temp109 = "dimm4"
+LABEL_temp110 = "dimm5"
+LABEL_temp111 = "dimm6"
+LABEL_temp112 = "dimm7"
+LABEL_temp113 = "dimm8"
+LABEL_temp114 = "dimm9"
+LABEL_temp115 = "dimm10"
+LABEL_temp116 = "dimm11"
+LABEL_temp117 = "dimm12"
+LABEL_temp118 = "dimm13"
+LABEL_temp119 = "dimm14"
+LABEL_temp120 = "dimm15"
+
+LABEL_temp137 = "core0"
+LABEL_temp138 = "core1"
+LABEL_temp139 = "core2"
+LABEL_temp140 = "core3"
+LABEL_temp141 = "core4"
+LABEL_temp142 = "core5"
+LABEL_temp143 = "core6"
+LABEL_temp144 = "core7"
+LABEL_temp145 = "core8"
+LABEL_temp146 = "core9"
+LABEL_temp147 = "core10"
+LABEL_temp148 = "core11"
+
+LABEL_temp192 = "membuf0"
+LABEL_temp193 = "membuf1"
+LABEL_temp194 = "membuf2"
+LABEL_temp195 = "membuf3"
+
+LABEL_power1 = "cpu0"
+LABEL_power2 = "cpu1"
+LABEL_power3 = "pcie0"
+LABEL_power4 = "pcie1"
+LABEL_power5 = "gpu"
+LABEL_power6 = "memory_cache"
+LABEL_power7 = "centaur0"
+LABEL_power8 = "centaur1"
+LABEL_power9 = "fan"
+
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/occ-hwmon@51.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/occ-hwmon@51.conf
new file mode 100644
index 0000000..23a9590
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/occ-hwmon@51.conf
@@ -0,0 +1,67 @@
+MODE_temp1 = "label"
+MODE_temp2 = "label"
+MODE_temp3 = "label"
+MODE_temp4 = "label"
+MODE_temp5 = "label"
+MODE_temp6 = "label"
+MODE_temp7 = "label"
+MODE_temp8 = "label"
+MODE_temp9 = "label"
+MODE_temp10 = "label"
+MODE_temp11 = "label"
+MODE_temp12 = "label"
+MODE_temp13 = "label"
+MODE_temp14 = "label"
+MODE_temp15 = "label"
+MODE_temp16 = "label"
+MODE_temp17 = "label"
+MODE_temp18 = "label"
+MODE_temp19 = "label"
+MODE_temp20 = "label"
+MODE_temp21 = "label"
+MODE_temp22 = "label"
+MODE_temp23 = "label"
+MODE_temp24 = "label"
+MODE_temp25 = "label"
+MODE_temp26 = "label"
+MODE_temp27 = "label"
+MODE_temp28 = "label"
+MODE_temp29 = "label"
+MODE_temp30 = "label"
+MODE_temp31 = "label"
+MODE_temp32 = "label"
+
+LABEL_temp121 = "dimm16"
+LABEL_temp122 = "dimm17"
+LABEL_temp123 = "dimm18"
+LABEL_temp124 = "dimm19"
+LABEL_temp125 = "dimm20"
+LABEL_temp126 = "dimm21"
+LABEL_temp127 = "dimm22"
+LABEL_temp128 = "dimm23"
+LABEL_temp129 = "dimm24"
+LABEL_temp130 = "dimm25"
+LABEL_temp131 = "dimm26"
+LABEL_temp132 = "dimm27"
+LABEL_temp133 = "dimm28"
+LABEL_temp134 = "dimm29"
+LABEL_temp135 = "dimm30"
+LABEL_temp136 = "dimm31"
+
+LABEL_temp149 = "core12"
+LABEL_temp150 = "core13"
+LABEL_temp151 = "core14"
+LABEL_temp152 = "core15"
+LABEL_temp153 = "core16"
+LABEL_temp154 = "core17"
+LABEL_temp155 = "core18"
+LABEL_temp156 = "core19"
+LABEL_temp157 = "core20"
+LABEL_temp158 = "core21"
+LABEL_temp159 = "core22"
+LABEL_temp160 = "core23"
+
+LABEL_temp196 = "membuf4"
+LABEL_temp197 = "membuf5"
+LABEL_temp198 = "membuf6"
+LABEL_temp199 = "membuf7"
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@400/rtc@68.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@400/rtc@68.conf
new file mode 100644
index 0000000..8b6053e
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@400/rtc@68.conf
@@ -0,0 +1,3 @@
+LABEL_temp1=rtc
+WARNLO_temp1=10000
+WARNHI_temp1=35000