diff --git a/device-types/Supermicro/MBD-X12STD-F.yaml b/device-types/Supermicro/MBD-X12STD-F.yaml
new file mode 100644
index 000000000..605e631dc
--- /dev/null
+++ b/device-types/Supermicro/MBD-X12STD-F.yaml
@@ -0,0 +1,23 @@
+---
+manufacturer: Supermicro
+model: Motherboard X12STD-F
+slug: supermicro-mbd-x12std-f
+part_number: MBD-X12STD-F
+u_height: 0
+is_full_depth: true
+airflow: front-to-rear
+comments: Supermicro motherboard X12STD-F (https://www.supermicro.com/en/products/motherboard/X12STD-F)
+subdevice_role: child
+module-bays:
+  - name: PCI-E 1
+    position: '1'
+    description: PCIe 4.0 x8 (Micro Low Profile)
+  - name: PCI-E 2
+    position: '2'
+    description: PCIe 4.0 x8 (Low Porfile)
+  - name: M.2 1
+    position: '3'
+    description: SATA/PCIe 3.0 x4 - Form factor 2280/22110
+  - name: M.2 2
+    position: '4'
+    description: SATA/PCIe 3.0 x4 - Form factor 2280/22110
diff --git a/device-types/Supermicro/SYS-530MT-H8TNR.yaml b/device-types/Supermicro/SYS-530MT-H8TNR.yaml
new file mode 100644
index 000000000..d2f06645a
--- /dev/null
+++ b/device-types/Supermicro/SYS-530MT-H8TNR.yaml
@@ -0,0 +1,51 @@
+---
+manufacturer: Supermicro
+model: SuperServer 530MT-H8TNR
+slug: supermicro-sys-530mt-h8tnr
+part_number: SYS-530MT-H8TNR
+u_height: 3
+is_full_depth: true
+airflow: front-to-rear
+comments: SuperServer SYS-530MT-H8TNR (https://www.supermicro.com/en/products/system/Microcloud/3U/SYS-530MT-H8TNR)
+subdevice_role: parent
+weight: 28.21
+weight_unit: kg
+interfaces:
+  - name: BMC 1
+    type: 1000base-t
+    mgmt_only: true
+    description: IPMI LAN port 1
+  - name: BMC 2
+    type: 1000base-t
+    mgmt_only: true
+    description: IPMI LAN port 2
+module-bays:
+  - name: PSU1
+    position: PSU1
+  - name: PSU2
+    position: PSU2
+device-bays:
+  - name: Node 1
+    position: Node1
+    label: Compute Node 1
+  - name: Node 2
+    position: Node2
+    label: Compute Node 2
+  - name: Node 3
+    position: Node3
+    label: Compute Node 3
+  - name: Node 4
+    position: Node4
+    label: Compute Node 4
+  - name: Node 5
+    position: Node5
+    label: Compute Node 5
+  - name: Node 6
+    position: Node6
+    label: Compute Node 6
+  - name: Node 7
+    position: Node7
+    label: Compute Node 7
+  - name: Node 8
+    position: Node8
+    label: Compute Node 8