diff --git a/device-types/HPE/ProLiant-DL385p-Gen8.yaml b/device-types/HPE/ProLiant-DL385p-Gen8.yaml
new file mode 100644
index 00000000..16089f98
--- /dev/null
+++ b/device-types/HPE/ProLiant-DL385p-Gen8.yaml
@@ -0,0 +1,44 @@
+---
+manufacturer: HPE
+model: ProLiant DL385p Gen8
+slug: hpe-proliant-dl385p-gen8
+part_number: 653203-B21
+airflow: front-to-rear
+u_height: 2
+is_full_depth: true
+comments: '[HPE ProLiant DL385p Gen8 Server QuickSpecs](https://www.hpe.com/psnow/doc/c04222529)'
+#minumum weight - one hard drive, power supply and processor installed
+weight: 18.59
+weight_unit: kg
+console-ports:
+  - name: Serial
+    type: de-9
+module-bays:
+  - name: PCIe1
+    position: PCIe1
+    label: primary riser
+  - name: PCIe2
+    position: PCIe2
+    label: primary riser
+  - name: PCIe3
+    position: PCIe3
+    label: primary riser
+  - name: PCIe4
+    position: PCIe4
+    label: secondary riser
+  - name: PCIe5
+    position: PCIe5
+    label: secondary riser
+  - name: PCIe6
+    position: PCIe6
+    label: secondary riser
+  - name: FlexLOM
+    position: FlexLOM
+  - name: PSU1
+    position: PSU1
+  - name: PSU2
+    position: PSU2
+interfaces:
+  - name: iLO
+    type: 1000base-t
+    mgmt_only: true
diff --git a/module-types/HPE/629135-B21.yaml b/module-types/HPE/629135-B21.yaml
new file mode 100644
index 00000000..7fd5d500
--- /dev/null
+++ b/module-types/HPE/629135-B21.yaml
@@ -0,0 +1,16 @@
+---
+manufacturer: HPE
+model: HPE Ethernet 1Gb 4-port 331FLR Adapter
+part_number: 629135-B21
+description: NIC for Embedded FlexibleLOM port on various HP Proliant Gen8 servers
+comments: "Ethernet 1Gb 4-port 331FLR Adapter, FlexibleLOM form-factor. Has four 10/100/1000BASE-T RJ45 ports. Requires CAT-5e or better twisted pair\r\n\
+  \r\n**Discontinued**. See:\r\n\r\n- [QuickSpecs](https://www.hpe.com/psnow/doc/c04111540.pdf)"
+interfaces:
+  - name: '{module}/1'
+    type: 1000base-t
+  - name: '{module}/2'
+    type: 1000base-t
+  - name: '{module}/3'
+    type: 1000base-t
+  - name: '{module}/4'
+    type: 1000base-t
diff --git a/module-types/HPE/629135-B22.yaml b/module-types/HPE/629135-B22.yaml
new file mode 100644
index 00000000..6165cfea
--- /dev/null
+++ b/module-types/HPE/629135-B22.yaml
@@ -0,0 +1,16 @@
+---
+manufacturer: HPE
+model: HPE Ethernet 1Gb 4-port FLR-T BCM5719 Adapter
+part_number: 629135-B22
+description: NIC for Embedded FlexibleLOM port on various HP Proliant Gen9 and Gen10; Apollo Gen9 servers
+comments: "Ethernet 1Gb 4-port FLR-T BCM5719 adapter, also known as Ethernet 1Gb 4-port 331FLR Adapter, FlexibleLOM form-factor. Has four 10/100/1000BASE-T\
+  \ RJ45 ports. Requires CAT-5e or better twisted pair\r\n\r\n**Discontinued**. See:\r\n\r\n- [QuickSpecs](https://www.hpe.com/psnow/doc/a00047730.pdf)"
+interfaces:
+  - name: '{module}/1'
+    type: 1000base-t
+  - name: '{module}/2'
+    type: 1000base-t
+  - name: '{module}/3'
+    type: 1000base-t
+  - name: '{module}/4'
+    type: 1000base-t
diff --git a/module-types/HPE/789897-001.yaml b/module-types/HPE/789897-001.yaml
deleted file mode 100644
index c36b3527..00000000
--- a/module-types/HPE/789897-001.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-manufacturer: HPE
-model: HPE Ethernet 1Gb 4-port 331FLR ALOM Adapter
-part_number: 789897-001
-description: NIC for Embedded ALOM (Advanced LOM / FlexibleLOM) port on various HP Proliant Gen9 and Gen10; Apollo Gen9 servers
-comments: "Ethernet 1Gb 4-port 331FLR adapter, FlexibleLOM form-factor. Has four 10/100/1000BASE-T RJ45 ports. Requires CAT5 or better twisted-pair.\r\n\
-  \r\n**Discontinued**. Successor: 629135-B22 / HPE Ethernet 1 Gb FLRu2011T BCM5719. See:\r\n\r\n- [QuickSpecs](https://www.hpe.com/psnow/doc/c04111540.pdf)\r\
-  \n- [Product Information Reference](https://support.hpe.com/hpesc/public/docDisplay?docId=c03225667&page=index.html)"
-interfaces:
-  - name: '{module}/1'
-    type: 1000base-t
-  - name: '{module}/2'
-    type: 1000base-t
-  - name: '{module}/3'
-    type: 1000base-t
-  - name: '{module}/4'
-    type: 1000base-t
diff --git a/module-types/HPE/HPE-Ethernet-1Gb-4-port-331i-LOM-Adapter.yaml b/module-types/HPE/HPE-Ethernet-1Gb-4-port-331i-LOM-Adapter.yaml
deleted file mode 100644
index 2fadd9b6..00000000
--- a/module-types/HPE/HPE-Ethernet-1Gb-4-port-331i-LOM-Adapter.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-manufacturer: HPE
-model: HPE Ethernet 1Gb 4-port 331i LOM Adapter
-description: NIC for Embedded LOM port on various HPE Proliant Gen9 + Gen10 servers
-comments: Embedded LOM port only NIC, shipped with the server, no part number available.
-interfaces:
-  - name: '{module}/1'
-    type: 1000base-t
-  - name: '{module}/2'
-    type: 1000base-t
-  - name: '{module}/3'
-    type: 1000base-t
-  - name: '{module}/4'
-    type: 1000base-t
diff --git a/module-types/HPE/P51181-B21.yaml b/module-types/HPE/P51181-B21.yaml
new file mode 100644
index 00000000..cefdbfdc
--- /dev/null
+++ b/module-types/HPE/P51181-B21.yaml
@@ -0,0 +1,16 @@
+---
+manufacturer: HPE
+model: Broadcom BCM5719 Ethernet 1Gb 4-port BASE-T Adapter for HPE
+part_number: P51181-B21
+description: NIC for Embedded OCP3 port on various HP Proliant Gen10+, Gen11 and Gen12 servers
+comments: "BCM5719 Ethernet 1Gb 4-port BASE-T adapter, OCP3 form-factor. Has four 10/100/1000BASE-T RJ45 ports. Requires CAT-5e or better twisted pair\r\
+  \n\r\nSee:\r\n\r\n- [QuickSpecs](https://www.hpe.com/psnow/doc/a00047730.pdf)"
+interfaces:
+  - name: '{module}/1'
+    type: 1000base-t
+  - name: '{module}/2'
+    type: 1000base-t
+  - name: '{module}/3'
+    type: 1000base-t
+  - name: '{module}/4'
+    type: 1000base-t