diff --git a/configurations/WFT Baseboard.json b/configurations/WFT Baseboard.json
index 12320b8..9e5a8ac 100644
--- a/configurations/WFT Baseboard.json
+++ b/configurations/WFT Baseboard.json
@@ -797,6 +797,7 @@
         },
         {
             "Address": "0x30",
+            "Bus": 0,
             "CpuID": 0,
             "Name": "Skylake CPU 0",
             "Thresholds": [
@@ -819,6 +820,7 @@
         },
         {
             "Address": "0x31",
+            "Bus": 0,
             "CpuID": 1,
             "Name": "Skylake CPU 1",
             "Thresholds": [
diff --git a/include/devices.hpp b/include/devices.hpp
index c926f96..77afe55 100644
--- a/include/devices.hpp
+++ b/include/devices.hpp
@@ -51,7 +51,10 @@
 
          },
          {"TMP421", ExportTemplate("tmp421 $Address",
-                                   "/sys/bus/i2c/devices/i2c-$Bus/new_device")
+                                   "/sys/bus/i2c/devices/i2c-$Bus/new_device")},
+         {"SkylakeCPU",
+          ExportTemplate("peci-client $Address",
+                         "/sys/bus/peci/devices/peci-$Bus/new_device")
 
          }}};
-} // namespace devices
\ No newline at end of file
+} // namespace devices
diff --git a/overlay_templates/SkylakeCPU.template b/overlay_templates/SkylakeCPU.template
deleted file mode 100644
index 882a144..0000000
--- a/overlay_templates/SkylakeCPU.template
+++ /dev/null
@@ -1,19 +0,0 @@
-/dts-v1/;
-/plugin/;
-/ {
-    compatible = "$Platform";
-    fragment@0{
-        target = <&peci0>;
-        __overlay__{
-            #address-cells = <1>;
-            #size-cells = <0>;
-
-            Skylake_CPU_$CpuID: peci-client@$Address {
-                compatible = "intel,peci-client";
-                oemname1 = "$Name";
-                reg = <0x$Address>;
-                status = "okay";
-            };
-        };
-    };
-};