diff --git a/configurations/1Ux16 Riser.json b/configurations/1Ux16 Riser.json
index 5d5b840..08aa342 100644
--- a/configurations/1Ux16 Riser.json
+++ b/configurations/1Ux16 Riser.json
@@ -43,7 +43,7 @@
                 "Address": "$address",
                 "Bus": "$bus",
                 "Name": "Riser 1 Fru",
-                "Type": "IntelFruDevice"
+                "Type": "EEPROM"
             }
         ],
         "Name": "1Ux16 Riser 1",
@@ -99,7 +99,7 @@
                 "Address": "$address",
                 "Bus": "$bus",
                 "Name": "Riser 2 Fru",
-                "Type": "IntelFruDevice"
+                "Type": "EEPROM"
             }
         ],
         "Name": "1Ux16 Riser 2",
diff --git a/configurations/2Ux8 Riser.json b/configurations/2Ux8 Riser.json
index 94b8026..49b7a6d 100644
--- a/configurations/2Ux8 Riser.json
+++ b/configurations/2Ux8 Riser.json
@@ -43,7 +43,7 @@
                 "Address": "$address",
                 "Bus": "$bus",
                 "Name": "Riser 1 Fru",
-                "Type": "IntelFruDevice"
+                "Type": "EEPROM"
             }
         ],
         "Name": "2Ux8 Riser 1",
@@ -99,7 +99,7 @@
                 "Address": "$address",
                 "Bus": "$bus",
                 "Name": "Riser 2 Fru",
-                "Type": "IntelFruDevice"
+                "Type": "EEPROM"
             }
         ],
         "Name": "2Ux8 Riser 2",
diff --git a/configurations/A2UL16RISER.json b/configurations/A2UL16RISER.json
index 35d9932..8fa4c4c 100644
--- a/configurations/A2UL16RISER.json
+++ b/configurations/A2UL16RISER.json
@@ -43,7 +43,7 @@
                 "Address": "$address",
                 "Bus": "$bus",
                 "Name": "Riser 1 Fru",
-                "Type": "IntelFruDevice"
+                "Type": "EEPROM"
             }
         ],
         "Name": "2U12x35 Riser1",
@@ -99,7 +99,7 @@
                 "Address": "$address",
                 "Bus": "$bus",
                 "Name": "Riser 2 Fru",
-                "Type": "IntelFruDevice"
+                "Type": "EEPROM"
             }
         ],
         "Name": "2U12x35 Riser2",
diff --git a/configurations/Delta DPS-750XB PSU.json b/configurations/Delta DPS-750XB PSU.json
index 57887b3..390b772 100644
--- a/configurations/Delta DPS-750XB PSU.json
+++ b/configurations/Delta DPS-750XB PSU.json
@@ -11,7 +11,7 @@
                 "Address": "$address",
                 "Bus": "$bus",
                 "Name": "Delta DPS-750XB PSU FRU",
-                "Type": "IntelFruDevice"
+                "Type": "EEPROM"
             }
         ],
         "Name": "Delta DPS-750XB PSU 2",
@@ -36,7 +36,7 @@
                 "Address": "$address",
                 "Bus": "$bus",
                 "Name": "Delta DPS-750XB PSU FRU",
-                "Type": "IntelFruDevice"
+                "Type": "EEPROM"
             }
         ],
         "Name": "Delta DPS-750XB PSU 1",
diff --git a/configurations/Flextronics S-1100ADU00-201 PSU.json b/configurations/Flextronics S-1100ADU00-201 PSU.json
index 82a3b6c..d9b6a52 100644
--- a/configurations/Flextronics S-1100ADU00-201 PSU.json
+++ b/configurations/Flextronics S-1100ADU00-201 PSU.json
@@ -11,7 +11,7 @@
                 "Address": "$address",
                 "Bus": "$bus",
                 "Name": "Flextronics S-1100ADU00-201 PSU FRU",
-                "Type": "IntelFruDevice"
+                "Type": "EEPROM"
             }
         ],
         "Name": "Flextronics S-1100ADU00-201 PSU 2",
@@ -36,7 +36,7 @@
                 "Address": "$address",
                 "Bus": "$bus",
                 "Name": "Flextronics S-1100ADU00-201 PSU FRU",
-                "Type": "IntelFruDevice"
+                "Type": "EEPROM"
             }
         ],
         "Name": "Flextronics S-1100ADU00-201 PSU 1",
diff --git a/configurations/Intel Front Panel.json b/configurations/Intel Front Panel.json
index 068b352..2973d86 100644
--- a/configurations/Intel Front Panel.json
+++ b/configurations/Intel Front Panel.json
@@ -4,7 +4,7 @@
             "Address": "$address",
             "Bus": "$bus",
             "Name": "Front Panel FRU",
-            "Type": "IntelFruDevice"
+            "Type": "EEPROM"
         },
         {
             "Address": "0x4D",
diff --git a/configurations/PCIE SSD Retimer.json b/configurations/PCIE SSD Retimer.json
index c2bf944..53adfd6 100644
--- a/configurations/PCIE SSD Retimer.json
+++ b/configurations/PCIE SSD Retimer.json
@@ -4,7 +4,7 @@
             "Address": "$address",
             "Bus": "$bus",
             "Name": "PCIE SSD Retimer FRU",
-            "Type": "IntelFruDevice"
+            "Type": "EEPROM"
         },
         {
             "Address": "0x4F",
diff --git a/configurations/PSSF132202A.json b/configurations/PSSF132202A.json
index dcba8f0..4d291ee 100644
--- a/configurations/PSSF132202A.json
+++ b/configurations/PSSF132202A.json
@@ -11,7 +11,7 @@
                 "Address": "$address",
                 "Bus": "$bus",
                 "Name": "Solum 1300W PSU 2 FRU",
-                "Type": "IntelFruDevice"
+                "Type": "EEPROM"
             }
         ],
         "Name": "Solum 1300W PSU 2",
@@ -36,7 +36,7 @@
                 "Address": "$address",
                 "Bus": "$bus",
                 "Name": "Solum 1300W PSU 1 FRU",
-                "Type": "IntelFruDevice"
+                "Type": "EEPROM"
             }
         ],
         "Name": "Solum 1300W PSU 1",
diff --git a/configurations/SAS Module.json b/configurations/SAS Module.json
index 2a1ad36..63c2a69 100644
--- a/configurations/SAS Module.json
+++ b/configurations/SAS Module.json
@@ -3,7 +3,7 @@
         {
             "Bus": "$bus",
             "Name": "SAS Module FRU",
-            "Type": "IntelFruDevice"
+            "Type": "EEPROM"
         },
         {
             "Address": "0x98",
diff --git a/configurations/SOLUM_PSSF162202_PSU.json b/configurations/SOLUM_PSSF162202_PSU.json
index 2730c24..6a56f62 100644
--- a/configurations/SOLUM_PSSF162202_PSU.json
+++ b/configurations/SOLUM_PSSF162202_PSU.json
@@ -11,7 +11,7 @@
                 "Address": "$address",
                 "Bus": "$bus",
                 "Name": "SOLUM CO IS162F22 PSU FRU",
-                "Type": "IntelFruDevice"
+                "Type": "EEPROM"
             }
         ],
         "Name": "SOLUM CO IS162F22 PSU 2",
@@ -36,7 +36,7 @@
                 "Address": "$address",
                 "Bus": "$bus",
                 "Name": "SOLUM CO IS162F22 PSU FRU",
-                "Type": "IntelFruDevice"
+                "Type": "EEPROM"
             }
         ],
         "Name": "SOLUM CO IS162F22 PSU 1",
diff --git a/include/devices.hpp b/include/devices.hpp
index 77afe55..95cdd96 100644
--- a/include/devices.hpp
+++ b/include/devices.hpp
@@ -38,7 +38,9 @@
 
 const boost::container::flat_map<const char *, ExportTemplate, CmpStr>
     exportTemplates{
-        {{"PCA9543Mux",
+        {{"EEPROM", ExportTemplate("eeprom $Address",
+                                   "/sys/bus/i2c/devices/i2c-$Bus/new_device")},
+         {"PCA9543Mux",
           ExportTemplate("pca9543 $Address",
                          "/sys/bus/i2c/devices/i2c-$Bus/new_device")},
          {"PCA9545Mux",
@@ -47,9 +49,7 @@
          {"pmbus", ExportTemplate("pmbus $Address",
                                   "/sys/bus/i2c/devices/i2c-$Bus/new_device")},
          {"TMP75", ExportTemplate("tmp75 $Address",
-                                  "/sys/bus/i2c/devices/i2c-$Bus/new_device")
-
-         },
+                                  "/sys/bus/i2c/devices/i2c-$Bus/new_device")},
          {"TMP421", ExportTemplate("tmp421 $Address",
                                    "/sys/bus/i2c/devices/i2c-$Bus/new_device")},
          {"SkylakeCPU",
diff --git a/overlay_templates/IntelFruDevice.template b/overlay_templates/IntelFruDevice.template
deleted file mode 100644
index 34a97e3..0000000
--- a/overlay_templates/IntelFruDevice.template
+++ /dev/null
@@ -1,20 +0,0 @@
-/dts-v1/;
-/plugin/;
-/ {
-    compatible = "$Platform";
-    fragment@0{
-        target = <&i2c$Bus>;
-        __overlay__{
-            #address-cells = <1>;
-            #size-cells = <0>;
-            status = "okay";
-            $Name: eeprom@$Address {
-                compatible = "atmel,24c02";
-                reg = <0x$Address>;
-                oemname1 = "$Name";
-                pagesize = <64>;
-            };
-        };
-
-    };
-};
\ No newline at end of file