diff --git a/configurations/bletchley_baseboard.json b/configurations/bletchley_baseboard.json
index a3aa03a..4e43ea6 100644
--- a/configurations/bletchley_baseboard.json
+++ b/configurations/bletchley_baseboard.json
@@ -363,43 +363,6 @@
             "Type": "ADM1278"
         },
         {
-            "Address": "0x40",
-            "Bus": 10,
-            "Name": "FRONT_PANEL_TEMP",
-            "Name1": "FRONT_PANEL_HUMIDTY",
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Index": 1,
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 40.0
-                },
-                {
-                    "Direction": "greater than",
-                    "Index": 1,
-                    "Name": "upper non critical",
-                    "Severity": 0,
-                    "Value": 39.0
-                },
-                {
-                    "Direction": "less than",
-                    "Index": 1,
-                    "Name": "lower non critical",
-                    "Severity": 0,
-                    "Value": 1
-                },
-                {
-                    "Direction": "less than",
-                    "Index": 1,
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 0
-                }
-            ],
-            "Type": "HDC1080"
-        },
-        {
             "Address": "0x45",
             "Bus": 0,
             "Labels": [
diff --git a/configurations/bletchley_frontpanel.json b/configurations/bletchley_frontpanel.json
new file mode 100644
index 0000000..bf433a8
--- /dev/null
+++ b/configurations/bletchley_frontpanel.json
@@ -0,0 +1,70 @@
+[
+    {
+        "Exposes": [
+            {
+                "Address": "0x40",
+                "Bus": 10,
+                "Name": "FRONT_PANEL_TEMP",
+                "Name1": "FRONT_PANEL_HUMIDTY",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Index": 1,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 40.0
+                    },
+                    {
+                        "Direction": "less than",
+                        "Index": 1,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 0
+                    }
+                ],
+                "Type": "HDC1080"
+            }
+        ],
+        "Name": "Bletchley Front Panel Board",
+        "Probe": [
+            "FOUND('Bletchley Baseboard')",
+            "AND",
+            "xyz.openbmc_project.Inventory.Decorator.Asset({'Model': 'Bletchley_FPB_HDC1080'})"
+        ],
+        "Type": "Board"
+    },
+    {
+        "Exposes": [
+            {
+                "Address": "0x40",
+                "Bus": 10,
+                "Name": "FRONT_PANEL_TEMP",
+                "Name1": "FRONT_PANEL_HUMIDTY",
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Index": 1,
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 40.0
+                    },
+                    {
+                        "Direction": "less than",
+                        "Index": 1,
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 0
+                    }
+                ],
+                "Type": "SI7020"
+            }
+        ],
+        "Name": "Bletchley Front Panel Board",
+        "Probe": [
+            "FOUND('Bletchley Baseboard')",
+            "AND",
+            "xyz.openbmc_project.Inventory.Decorator.Asset({'Model': 'Bletchley_FPB_SI7021'})"
+        ],
+        "Type": "Board"
+    }
+]
diff --git a/meson.build b/meson.build
index 148fd64..ad40c96 100644
--- a/meson.build
+++ b/meson.build
@@ -81,6 +81,7 @@
     'asrock_romed8hm3.json',
     'bletchley_baseboard.json',
     'bletchley_chassis.json',
+    'bletchley_frontpanel.json',
     'blyth.json',
     'ahw1um2riser.json',
     'aspower_u1a-d10550_psu.json',