diff --git a/device-types/Supermicro/MBD-X11SCD-F.yaml b/device-types/Supermicro/MBD-X11SCD-F.yaml
new file mode 100644
index 000000000..0347f9031
--- /dev/null
+++ b/device-types/Supermicro/MBD-X11SCD-F.yaml
@@ -0,0 +1,23 @@
+---
+manufacturer: Supermicro
+model: Motherboard X11SCD-F
+slug: supermicro-mbd-x11scd-f
+part_number: MBD-X11SCD-F
+u_height: 0
+is_full_depth: true
+airflow: front-to-rear
+comments: Supermicro motherboard X11SCD-F (https://www.supermicro.com/en/products/motherboard/X11SCD-F)
+subdevice_role: child
+module-bays:
+  - name: PCI-E 1
+    position: '1'
+    description: PCIe 3.0 x8 (Micro Low Profile)
+  - name: PCI-E 2
+    position: '2'
+    description: PCIe 3.0 x8
+  - name: M.2 1
+    position: '3'
+    description: SATA/PCIe 3.0 x4 - Form factor 2242/2280 M-Key
+  - name: M.2 2
+    position: '4'
+    description: SATA/PCIe 3.0 x4 - Form factor 2242/2280/22110 M-Key
diff --git a/device-types/Supermicro/SYS-5039MC-H8TRF.yaml b/device-types/Supermicro/SYS-5039MC-H8TRF.yaml
new file mode 100644
index 000000000..5e8bf0252
--- /dev/null
+++ b/device-types/Supermicro/SYS-5039MC-H8TRF.yaml
@@ -0,0 +1,43 @@
+---
+manufacturer: Supermicro
+model: SuperServer 5039MC-H8TRF
+slug: supermicro-sys-5039mc-h8trf
+part_number: SYS-5039MC-H8TRF
+u_height: 3
+is_full_depth: true
+airflow: front-to-rear
+comments: SuperServer SYS-5039MC-H8TRF (https://www.supermicro.com/en/products/system/3u/5039/sys-5039mc-h8trf.cfm)
+subdevice_role: parent
+weight: 28.21
+weight_unit: kg
+module-bays:
+  - name: PSU1
+    position: PSU1
+  - name: PSU2
+    position: PSU2
+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
+device-bays:
+  - name: Node 1
+    label: Compute Node 1
+  - name: Node 2
+    label: Compute Node 2
+  - name: Node 3
+    label: Compute Node 3
+  - name: Node 4
+    label: Compute Node 4
+  - name: Node 5
+    label: Compute Node 5
+  - name: Node 6
+    label: Compute Node 6
+  - name: Node 7
+    label: Compute Node 7
+  - name: Node 8
+    label: Compute Node 8