diff --git a/device-types/Supermicro/AS-3015MR-H8TNR.yaml b/device-types/Supermicro/AS-3015MR-H8TNR.yaml
new file mode 100644
index 000000000..39c41784f
--- /dev/null
+++ b/device-types/Supermicro/AS-3015MR-H8TNR.yaml
@@ -0,0 +1,45 @@
+---
+manufacturer: Supermicro
+model: MicroCloud A+ Server AS 3015MR-H8TNR
+slug: supermicro-as-3015mr-h8tnr
+part_number: AS-3015MR-H8TNR
+u_height: 3
+is_full_depth: true
+airflow: front-to-rear
+comments: '[MicroCloud A+ Server AS 3015MR-H8TNR](https://www.supermicro.com/en/products/system/microcloud/3u/as%20-3015mr-h8tnr)'
+subdevice_role: parent
+weight: 28.21
+weight_unit: kg
+interfaces:
+  - name: IPMI 1
+    type: 1000base-t
+    mgmt_only: true
+    description: Redundant IPMI port
+  - name: IPMI 2
+    type: 1000base-t
+    mgmt_only: true
+    description: Redundant IPMI port
+module-bays:
+  - name: PSU0
+    position: PSU 0
+    maximum_draw: 2200
+  - name: PSU1
+    position: PSU 1
+    maximum_draw: 2200
+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
diff --git a/module-types/Supermicro/AOC-C25G-m1S.yaml b/module-types/Supermicro/AOC-C25G-m1S.yaml
new file mode 100644
index 000000000..cb8993667
--- /dev/null
+++ b/module-types/Supermicro/AOC-C25G-m1S.yaml
@@ -0,0 +1,10 @@
+---
+manufacturer: Supermicro
+model: Add-on Card AOC-C25G-m1S
+part_number: AOC-C25G-m1S
+description: Mellanox ConnectX-4 Lx EN controller - Advanced I/O Module (AIOM) Form Factor
+comments: '[AOC-C25G-m1S Product Sheet](https://www.supermicro.com/en/products/accessories/addon/AOC-C25G-m1S.php)'
+interfaces:
+  - name: Ethernet/{module}/1
+    type: 25gbase-x-sfp28
+    mgmt_only: false
diff --git a/module-types/Supermicro/AOC-MCX4121A-ACAT.yaml b/module-types/Supermicro/AOC-MCX4121A-ACAT.yaml
new file mode 100644
index 000000000..4fe3d1d46
--- /dev/null
+++ b/module-types/Supermicro/AOC-MCX4121A-ACAT.yaml
@@ -0,0 +1,12 @@
+---
+manufacturer: Supermicro
+model: Add-on Card AOC-MCX4121A-ACAT
+part_number: AOC-MCX4121A-ACAT
+description: Mellanox® ConnectX-4 Lx EN
+interfaces:
+  - name: Ethernet/{module}/1
+    type: 25gbase-x-sfp28
+    mgmt_only: false
+  - name: Ethernet/{module}/2
+    type: 25gbase-x-sfp28
+    mgmt_only: false
diff --git a/module-types/Supermicro/AOC-S25GC-i2S.yaml b/module-types/Supermicro/AOC-S25GC-i2S.yaml
new file mode 100644
index 000000000..d60527e7c
--- /dev/null
+++ b/module-types/Supermicro/AOC-S25GC-i2S.yaml
@@ -0,0 +1,13 @@
+---
+manufacturer: Supermicro
+model: Add-on Card AOC-S25GC-i2S
+part_number: AOC-S25GC-i2S
+description: Intel E810-XXVAM2 Ethernet Controller - Advanced I/O Module (AIOM) Form Factor
+comments: '[AOC-S25GC-i2S Product Sheet](https://www.supermicro.com/en/products/accessories/addon/AOC-S25GC-i2S.php)'
+interfaces:
+  - name: Ethernet/{module}/1
+    type: 25gbase-x-sfp28
+    mgmt_only: false
+  - name: Ethernet/{module}/2
+    type: 25gbase-x-sfp28
+    mgmt_only: false
diff --git a/module-types/Supermicro/PWS-2K20A-1R.yml b/module-types/Supermicro/PWS-2K20A-1R.yml
new file mode 100644
index 000000000..50c480ede
--- /dev/null
+++ b/module-types/Supermicro/PWS-2K20A-1R.yml
@@ -0,0 +1,9 @@
+---
+manufacturer: Supermicro
+model: PWS-2K20A-1R
+part_number: PWS-2K20A-1R
+comments: '[2200W 1U Redundant Power Supply](https://store.supermicro.com/us_en/pub/media/wysiwyg/productspecs/PWS-2K20A-1R/PWS-2K20A-1R_datasheet_Spec_11092018.pdf)'
+power-ports:
+  - name: PSU{module}
+    type: iec-60320-c14
+    maximum_draw: 2200