diff --git a/configurations/Bletchley.json b/configurations/Bletchley_Baseboard.json
similarity index 94%
rename from configurations/Bletchley.json
rename to configurations/Bletchley_Baseboard.json
index 59473ff..b1c6f00 100644
--- a/configurations/Bletchley.json
+++ b/configurations/Bletchley_Baseboard.json
@@ -378,6 +378,50 @@
             "Type": "HDC1080"
         },
         {
+            "LED": "fan0_fault",
+            "Name": "System Fan Connector 0",
+            "Pwm": 0,
+            "Status": "disabled",
+            "Tachs": [
+                0,
+                1
+            ],
+            "Type": "IntelFanConnector"
+        },
+        {
+            "LED": "fan1_fault",
+            "Name": "System Fan Connector 1",
+            "Pwm": 1,
+            "Status": "disabled",
+            "Tachs": [
+                2,
+                3
+            ],
+            "Type": "IntelFanConnector"
+        },
+        {
+            "LED": "fan2_fault",
+            "Name": "System Fan Connector 2",
+            "Pwm": 2,
+            "Status": "disabled",
+            "Tachs": [
+                4,
+                5
+            ],
+            "Type": "IntelFanConnector"
+        },
+        {
+            "LED": "fan3_fault",
+            "Name": "System Fan Connector 3",
+            "Pwm": 3,
+            "Status": "disabled",
+            "Tachs": [
+                6,
+                7
+            ],
+            "Type": "IntelFanConnector"
+        },
+        {
             "Address": "0x40",
             "Bus": 0,
             "Labels": [
diff --git a/configurations/Bletchley_Chassis.json b/configurations/Bletchley_Chassis.json
new file mode 100644
index 0000000..67e3607
--- /dev/null
+++ b/configurations/Bletchley_Chassis.json
@@ -0,0 +1,175 @@
+{
+    "Exposes": [
+        {
+            "BindConnector": "System Fan Connector 0",
+            "Index": 0,
+            "Name": "FAN0_TACH_IL",
+            "PowerState": "Always",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 7920
+                },
+                {
+                    "Direction": "less than",
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 700
+                }
+            ],
+            "Type": "AspeedFan"
+        },
+        {
+            "BindConnector": "System Fan Connector 0",
+            "Index": 1,
+            "Name": "FAN0_TACH_OL",
+            "PowerState": "Always",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 7920
+                },
+                {
+                    "Direction": "less than",
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 700
+                }
+            ],
+            "Type": "AspeedFan"
+        },
+        {
+            "BindConnector": "System Fan Connector 1",
+            "Index": 2,
+            "Name": "FAN1_TACH_IL",
+            "PowerState": "Always",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 7920
+                },
+                {
+                    "Direction": "less than",
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 700
+                }
+            ],
+            "Type": "AspeedFan"
+        },
+        {
+            "BindConnector": "System Fan Connector 1",
+            "Index": 3,
+            "Name": "FAN1_TACH_OL",
+            "PowerState": "Always",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 7920
+                },
+                {
+                    "Direction": "less than",
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 700
+                }
+            ],
+            "Type": "AspeedFan"
+        },
+        {
+            "BindConnector": "System Fan Connector 2",
+            "Index": 4,
+            "Name": "FAN2_TACH_IL",
+            "PowerState": "Always",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 7920
+                },
+                {
+                    "Direction": "less than",
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 700
+                }
+            ],
+            "Type": "AspeedFan"
+        },
+        {
+            "BindConnector": "System Fan Connector 2",
+            "Index": 5,
+            "Name": "FAN2_TACH_OL",
+            "PowerState": "Always",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 7920
+                },
+                {
+                    "Direction": "less than",
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 700
+                }
+            ],
+            "Type": "AspeedFan"
+        },
+        {
+            "BindConnector": "System Fan Connector 3",
+            "Index": 6,
+            "Name": "FAN3_TACH_IL",
+            "PowerState": "Always",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 7920
+                },
+                {
+                    "Direction": "less than",
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 700
+                }
+            ],
+            "Type": "AspeedFan"
+        },
+        {
+            "BindConnector": "System Fan Connector 3",
+            "Index": 7,
+            "Name": "FAN3_TACH_OL",
+            "PowerState": "Always",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 7920
+                },
+                {
+                    "Direction": "less than",
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 700
+                }
+            ],
+            "Type": "AspeedFan"
+        }
+    ],
+    "Name": "Bletchley Chassis",
+    "Probe": "FOUND('Bletchley Baseboard')",
+    "Type": "Chassis"
+}
diff --git a/meson.build b/meson.build
index 2869434..db887ef 100644
--- a/meson.build
+++ b/meson.build
@@ -86,7 +86,8 @@
     'A2UX8X4RISER.json',
     'ACBELL_RICA_PSU.json',
     'ASRock_E3C246D4I.json',
-    'Bletchley.json',
+    'Bletchley_Baseboard.json',
+    'Bletchley_Chassis.json',
     'Blyth.json',
     'AHW1UM2RISER.json',
     'ASPOWER_U1A-D10550_PSU.json',