diff --git a/configurations/STP Baseboard.json b/configurations/STP Baseboard.json
index b88409d..4c82097 100644
--- a/configurations/STP Baseboard.json
+++ b/configurations/STP Baseboard.json
@@ -802,19 +802,17 @@
         },
         {
             "cpu_id": 0,
-            "dimm_nums": 12,
+            "address": "0x30",
             "name": "Skylake CPU 0",
-            "show_core": 1,
             "type": "SkylakeCPU"
         },
         {
             "cpu_id": 1,
-            "dimm_nums": 12,
+            "address": "0x31",
             "name": "Skylake CPU 1",
-            "show_core": 1,
             "type": "SkylakeCPU"
         }
     ],
     "name": "STP Baseboard",
     "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': '.*STB'})"
-}
\ No newline at end of file
+}
diff --git a/configurations/WFT Baseboard.json b/configurations/WFT Baseboard.json
index d156f79..6d8aae0 100644
--- a/configurations/WFT Baseboard.json
+++ b/configurations/WFT Baseboard.json
@@ -797,16 +797,14 @@
         },
         {
             "cpu_id": 0,
-            "dimm_nums": 12,
+            "address": "0x30",
             "name": "Skylake CPU 0",
-            "show_core": 1,
             "type": "SkylakeCPU"
         },
         {
             "cpu_id": 1,
-            "dimm_nums": 12,
+            "address": "0x31",
             "name": "Skylake CPU 1",
-            "show_core": 1,
             "type": "SkylakeCPU"
         }
     ],
@@ -816,4 +814,4 @@
     "part_number": "$CHASSIS_PART_NUMBER",
     "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': '.*WFT'})",
     "serial_number": "$CHASSIS_SERIAL_NUMBER"
-}
\ No newline at end of file
+}
diff --git a/overlay_templates/SkylakeCPU.template b/overlay_templates/SkylakeCPU.template
index feb49e0..c614916 100644
--- a/overlay_templates/SkylakeCPU.template
+++ b/overlay_templates/SkylakeCPU.template
@@ -3,62 +3,64 @@
 / {
     compatible = "$platform";
     fragment@0{
-        target = <&peci_hwmon$cpu_id>;
+        target = <&peci0>;
         __overlay__{
-            show-core = <$show_core>;
-            dimm-nums = <$dimm_nums>;
-            status = "okay";
+            #address-cells = <1>;
+            #size-cells = <0>;
 
-            oemname1 = "Die_Temp_CPU$cpu_id";
-            oemname2 = "DTS_Thermal_Margin_CPU$cpu_id";
-            oemname3 = "TControl_CPU$cpu_id";
-            oemname4 = "TThrottle_CPU$cpu_id";
+            peci-hwmon@Skylake_CPU_$cpu_id {
+                compatible = "intel,peci-hwmon";
+                reg = <$address>;
+                status = "okay";
 
-            oemname100 = "Core0_Temp_CPU$cpu_id";
-            oemname101 = "Core1_Temp_CPU$cpu_id";
-            oemname102 = "Core2_Temp_CPU$cpu_id";
-            oemname103 = "Core3_Temp_CPU$cpu_id";
-            oemname104 = "Core4_Temp_CPU$cpu_id";
-            oemname105 = "Core5_Temp_CPU$cpu_id";
-            oemname106 = "Core6_Temp_CPU$cpu_id";
-            oemname107 = "Core7_Temp_CPU$cpu_id";
-            oemname108 = "Core8_Temp_CPU$cpu_id";
-            oemname109 = "Core9_Temp_CPU$cpu_id";
-            oemname110 = "Core10_Temp_CPU$cpu_id";
-            oemname111 = "Core11_Temp_CPU$cpu_id";
-            oemname112 = "Core12_Temp_CPU$cpu_id";
-            oemname113 = "Core13_Temp_CPU$cpu_id";
-            oemname114 = "Core14_Temp_CPU$cpu_id";
-            oemname115 = "Core15_Temp_CPU$cpu_id";
-            oemname116 = "Core16_Temp_CPU$cpu_id";
-            oemname117 = "Core17_Temp_CPU$cpu_id";
-            oemname118 = "Core18_Temp_CPU$cpu_id";
-            oemname119 = "Core19_Temp_CPU$cpu_id";
-            oemname120 = "Core20_Temp_CPU$cpu_id";
-            oemname121 = "Core21_Temp_CPU$cpu_id";
-            oemname122 = "Core22_Temp_CPU$cpu_id";
-            oemname123 = "Core23_Temp_CPU$cpu_id";
-            oemname124 = "Core24_Temp_CPU$cpu_id";
-            oemname125 = "Core25_Temp_CPU$cpu_id";
-            oemname126 = "Core26_Temp_CPU$cpu_id";
-            oemname127 = "Core27_Temp_CPU$cpu_id";
+                oemname1 = "Die_Temp_CPU$cpu_id";
+                oemname2 = "DTS_Thermal_Margin_CPU$cpu_id";
+                oemname3 = "TControl_CPU$cpu_id";
+                oemname4 = "TThrottle_CPU$cpu_id";
+                oemname5 = "Tjmax_CPU$cpu_id";
 
-            oemname200 = "DIMM0_Temp_CPU$cpu_id";
-            oemname201 = "DIMM1_Temp_CPU$cpu_id";
-            oemname202 = "DIMM2_Temp_CPU$cpu_id";
-            oemname203 = "DIMM3_Temp_CPU$cpu_id";
-            oemname204 = "DIMM4_Temp_CPU$cpu_id";
-            oemname205 = "DIMM5_Temp_CPU$cpu_id";
-            oemname206 = "DIMM6_Temp_CPU$cpu_id";
-            oemname207 = "DIMM7_Temp_CPU$cpu_id";
-            oemname208 = "DIMM8_Temp_CPU$cpu_id";
-            oemname209 = "DIMM9_Temp_CPU$cpu_id";
-            oemname210 = "DIMM10_Temp_CPU$cpu_id";
-            oemname211 = "DIMM11_Temp_CPU$cpu_id";
-            oemname212 = "DIMM12_Temp_CPU$cpu_id";
-            oemname213 = "DIMM13_Temp_CPU$cpu_id";
-            oemname214 = "DIMM14_Temp_CPU$cpu_id";
-            oemname215 = "DIMM15_Temp_CPU$cpu_id";
+                oemname100 = "Core0_Temp_CPU$cpu_id";
+                oemname101 = "Core1_Temp_CPU$cpu_id";
+                oemname102 = "Core2_Temp_CPU$cpu_id";
+                oemname103 = "Core3_Temp_CPU$cpu_id";
+                oemname104 = "Core4_Temp_CPU$cpu_id";
+                oemname105 = "Core5_Temp_CPU$cpu_id";
+                oemname106 = "Core6_Temp_CPU$cpu_id";
+                oemname107 = "Core7_Temp_CPU$cpu_id";
+                oemname108 = "Core8_Temp_CPU$cpu_id";
+                oemname109 = "Core9_Temp_CPU$cpu_id";
+                oemname110 = "Core10_Temp_CPU$cpu_id";
+                oemname111 = "Core11_Temp_CPU$cpu_id";
+                oemname112 = "Core12_Temp_CPU$cpu_id";
+                oemname113 = "Core13_Temp_CPU$cpu_id";
+                oemname114 = "Core14_Temp_CPU$cpu_id";
+                oemname115 = "Core15_Temp_CPU$cpu_id";
+                oemname116 = "Core16_Temp_CPU$cpu_id";
+                oemname117 = "Core17_Temp_CPU$cpu_id";
+                oemname118 = "Core18_Temp_CPU$cpu_id";
+                oemname119 = "Core19_Temp_CPU$cpu_id";
+                oemname120 = "Core20_Temp_CPU$cpu_id";
+                oemname121 = "Core21_Temp_CPU$cpu_id";
+                oemname122 = "Core22_Temp_CPU$cpu_id";
+                oemname123 = "Core23_Temp_CPU$cpu_id";
+                oemname124 = "Core24_Temp_CPU$cpu_id";
+                oemname125 = "Core25_Temp_CPU$cpu_id";
+                oemname126 = "Core26_Temp_CPU$cpu_id";
+                oemname127 = "Core27_Temp_CPU$cpu_id";
+
+                oemname200 = "DIMM0_Temp_CPU$cpu_id";
+                oemname201 = "DIMM1_Temp_CPU$cpu_id";
+                oemname202 = "DIMM2_Temp_CPU$cpu_id";
+                oemname203 = "DIMM3_Temp_CPU$cpu_id";
+                oemname204 = "DIMM4_Temp_CPU$cpu_id";
+                oemname205 = "DIMM5_Temp_CPU$cpu_id";
+                oemname206 = "DIMM6_Temp_CPU$cpu_id";
+                oemname207 = "DIMM7_Temp_CPU$cpu_id";
+                oemname208 = "DIMM8_Temp_CPU$cpu_id";
+                oemname209 = "DIMM9_Temp_CPU$cpu_id";
+                oemname210 = "DIMM10_Temp_CPU$cpu_id";
+                oemname211 = "DIMM11_Temp_CPU$cpu_id";
+            };
         };
     };
 };