diff --git a/device-types/Supermicro/SYS-5018D-FN8T.yaml b/device-types/Supermicro/SYS-5018D-FN8T.yaml
new file mode 100644
index 000000000..a98155d02
--- /dev/null
+++ b/device-types/Supermicro/SYS-5018D-FN8T.yaml
@@ -0,0 +1,49 @@
+---
+manufacturer: Supermicro
+model: SuperServer 5018D-FN8T
+slug: supermicro-sys-5018d-fn8t
+part_number: SYS-5018D-FN8T
+u_height: 1
+is_full_depth: false
+weight: 3.63
+weight_unit: kg
+airflow: front-to-rear
+front_image: true
+comments: SuperServer 5018D-FN8T (https://www.supermicro.com/products/system/1U/5018/SYS-5018D-FN8T.cfm)
+power-ports:
+  - name: Power 1
+    type: iec-60320-c14
+    maximum_draw: 200
+interfaces:
+  - name: Gig-E 1
+    type: 1000base-t
+  - name: Gig-E 2
+    type: 1000base-t
+  - name: Gig-E 3
+    type: 1000base-t
+  - name: Gig-E 4
+    type: 1000base-t
+  - name: Gig-E 5
+    type: 1000base-t
+  - name: Gig-E 6
+    type: 1000base-t
+  - name: Gig-E 7
+    type: 10gbase-x-sfpp
+  - name: Gig-E 8
+    type: 10gbase-x-sfpp
+  - name: BMC
+    type: 1000base-t
+    mgmt_only: true
+module-bays:
+  - name: PCI-E 1
+    position: '1'
+    description: PCI-E 3.0 x8 slot
+  - name: PCI-E 2
+    position: '2'
+    description: PCI-E 3.0 x8 slot
+  - name: PCI-E 3
+    position: '3'
+    description: Mini-PCIe (mSATA support)
+  - name: M.2 1
+    position: '4'
+    description: M.2 PCI-E 3.0 x4 (SATA support), M Key 2242/2280/22110
diff --git a/device-types/Supermicro/SYS-5019D-FN8TP.yaml b/device-types/Supermicro/SYS-5019D-FN8TP.yaml
new file mode 100644
index 000000000..a82a43b9e
--- /dev/null
+++ b/device-types/Supermicro/SYS-5019D-FN8TP.yaml
@@ -0,0 +1,52 @@
+---
+manufacturer: Supermicro
+model: SuperServer 5019D-FN8TP
+slug: supermicro-sys-5019d-fn8tp
+part_number: SYS-5019D-FN8TP
+u_height: 1
+is_full_depth: false
+weight: 3.63
+weight_unit: kg
+airflow: front-to-rear
+front_image: true
+comments: SuperServer 5019D-FN8TP (https://www.supermicro.com/products/system/1u/5019/SYS-5019D-FN8TP.cfm)
+power-ports:
+  - name: Power 1
+    type: iec-60320-c14
+    maximum_draw: 200
+interfaces:
+  - name: Gig-E 1
+    type: 1000base-t
+  - name: Gig-E 2
+    type: 1000base-t
+  - name: Gig-E 3
+    type: 1000base-t
+  - name: Gig-E 4
+    type: 1000base-t
+  - name: Gig-E 5
+    type: 10gbase-t
+  - name: Gig-E 6
+    type: 10gbase-t
+  - name: Gig-E 7
+    type: 10gbase-x-sfpp
+  - name: Gig-E 8
+    type: 10gbase-x-sfpp
+  - name: BMC
+    type: 1000base-t
+    mgmt_only: true
+module-bays:
+  - name: PCI-E 1
+    position: '1'
+    description: PCI-E 3.0 x8 slot
+  - name: PCI-E 2
+    position: '2'
+    description: PCI-E 3.0 x16 slot
+  - name: PCI-E 3
+    position: '3'
+    description: Mini-PCIe
+  - name: M.2 1
+    position: '4'
+    description: M.2 M key for SSD, 2242/8
+  - name: M.2 2
+    position: '5'
+    description: M.2 B Key for SSD/WAN card
diff --git a/elevation-images/Supermicro/supermicro-sys-5018d-fn8t.front.jpg b/elevation-images/Supermicro/supermicro-sys-5018d-fn8t.front.jpg
new file mode 100644
index 000000000..53b62f962
Binary files /dev/null and b/elevation-images/Supermicro/supermicro-sys-5018d-fn8t.front.jpg differ
diff --git a/elevation-images/Supermicro/supermicro-sys-5019d-fn8tp.front.jpg b/elevation-images/Supermicro/supermicro-sys-5019d-fn8tp.front.jpg
new file mode 100644
index 000000000..2669ed5cb
Binary files /dev/null and b/elevation-images/Supermicro/supermicro-sys-5019d-fn8tp.front.jpg differ