diff --git a/device-types/HPE/ProLiant-DL360-Gen10.yaml b/device-types/HPE/ProLiant-DL360-Gen10.yaml
index 131a1e85..d3bf4a2b 100644
--- a/device-types/HPE/ProLiant-DL360-Gen10.yaml
+++ b/device-types/HPE/ProLiant-DL360-Gen10.yaml
@@ -6,6 +6,7 @@ u_height: 1
 is_full_depth: true
 airflow: front-to-rear
 part_number: P19766-B21
+front_image: true
 comments: '[HPE ProLiant DL360 G10 Server QuickSpecs](https://www.hpe.com/psnow/doc/a00008159enw)'
 #minumum weight - one hard drive, power supply and processor installed
 weight: 13.04
@@ -13,28 +14,30 @@ weight_unit: kg
 console-ports:
   - name: Serial
     type: de-9
-module-bays:
-  - name: PSU1
-    position: PSU1
-  - name: PSU2
-    position: PSU2
-  - name: FlexLOM
-    position: FlexLOM
-  - name: PCIe1
-    position: PCIe1
-  - name: PCIe2
-    position: PCIe2
-  - name: PCIe3
-    position: PCIe3
 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: iLO
     type: 1000base-t
     mgmt_only: true
+module-bays:
+  - name: Embedded ALOM / Flexible LOM
+    position: ALOM
+    description: 'rear: bottom left corner. Advanced LOM / Flexible LOM. Interfaces numbered right to left. ALOM cards available e.g. 4x1Gig, 2x10Gig, 4x10Gig,
+      2x25Gig, 2x40G'
+  - name: Embedded LOM
+    position: LOM
+    description: 'rear: right side of the ILO labeled port. Interfaces numbered left to right. LOM port, only 4-Gig Ethernet cards available if purchased.'
+  - name: PCI-E Slot 1
+    position: PCIe1
+    description: 'rear: upper left corner, full/standard-height'
+  - name: PCI-E Slot 2
+    position: PCIe2
+    description: 'rear: upper middle slot, half-height / low-profile'
+  - name: PCI-E Slot 3
+    position: PCIe3
+    description: 'rear: upper right slot, half-height / low-profile'
+  - name: PSU Bay 1
+    position: PSU1
+    description: 'rear: right PSU slot. Type: HPE Flexible Slot (Flex Slot)'
+  - name: PSU Bay 2
+    position: PSU2
+    description: 'rear: left PSU slot. Type: HPE Flexible Slot (Flex Slot)'
diff --git a/elevation-images/HPE/hpe-proliant-dl360-gen10.front.png b/elevation-images/HPE/hpe-proliant-dl360-gen10.front.png
new file mode 100644
index 00000000..5c3fe96b
Binary files /dev/null and b/elevation-images/HPE/hpe-proliant-dl360-gen10.front.png differ
diff --git a/module-types/HPE/649871-001.yaml b/module-types/HPE/649871-001.yaml
new file mode 100644
index 00000000..45b33a36
--- /dev/null
+++ b/module-types/HPE/649871-001.yaml
@@ -0,0 +1,17 @@
+---
+manufacturer: HPE
+model: HPE Ethernet 1Gb 4-port 331T PCIe Adapter
+part_number: 649871-001
+description: NIC for PCIe port on various HP Proliant Gen9 and Gen10; Apollo Gen9 servers
+comments: "Ethernet 1Gb 4-port 331T adapter, PCIe form-factor. Has four 10/100/1000BASE-T RJ45 ports. Requires CAT5 or better twisted-pair.\r\n\r\n**Discontinued**.\
+  \ See:\r\n\r\n- [QuickSpecs](https://www.hpe.com/psnow/doc/c04111478)\r\n- [System specifications](https://support.hpe.com/hpesc/public/docDisplay?docId=c03225747&docLocale=en_US)\r\
+  \n- [Product Information Reference](https://support.hpe.com/hpesc/public/docDisplay?docId=c03225735&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/669280-001.yaml b/module-types/HPE/669280-001.yaml
new file mode 100644
index 00000000..2bb06662
--- /dev/null
+++ b/module-types/HPE/669280-001.yaml
@@ -0,0 +1,16 @@
+---
+manufacturer: HPE
+model: HPE Ethernet 1Gb 4-port 366FLR ALOM Adapter
+part_number: 669280-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 366FLR 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/c04111405.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/720478-B21.yaml b/module-types/HPE/720478-B21.yaml
index 2c79d699..4e259caf 100644
--- a/module-types/HPE/720478-B21.yaml
+++ b/module-types/HPE/720478-B21.yaml
@@ -1,6 +1,6 @@
 ---
 manufacturer: HPE
-model: 720478-B21
+model: HPE PSU 500W Flex Slot Power Supply
 part_number: 720478-B21
 description: 500W Flex Slot Power Supply Kit for ProLiant G9
 weight: 1
diff --git a/module-types/HPE/789897-001.yaml b/module-types/HPE/789897-001.yaml
new file mode 100644
index 00000000..c36b3527
--- /dev/null
+++ b/module-types/HPE/789897-001.yaml
@@ -0,0 +1,17 @@
+---
+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/816551-001.yaml b/module-types/HPE/816551-001.yaml
new file mode 100644
index 00000000..c7bda0b7
--- /dev/null
+++ b/module-types/HPE/816551-001.yaml
@@ -0,0 +1,17 @@
+---
+manufacturer: HPE
+model: HPE Ethernet 1Gb 4-port 366T PCIe Adapter
+part_number: 816551-001
+description: PCIe Full-Height and Half-Height NIC on various HP Proliant Gen9 and Gen10; Apollo Gen9 servers
+comments: "PCIe port Ethernet 1Gb 4-port 366T adapter. Has four 10/100/1000BASE-T RJ45 ports. Requires CAT5 or better twisted-pair.\r\n\r\n**Discontinued**.\
+  \ See:\r\n\r\n- [QuickSpecs](https://www.hpe.com/psnow/doc/c04605552)\r\n- [Technical specifications](https://support.hpe.com/hpesc/public/docDisplay?docId=c04770273&page=GUID-97F533AE-68B3-4323-BFC9-C44F3B3D0EDE.html)\r\
+  \n- [Product Information Reference](https://support.hpe.com/hpesc/public/docDisplay?docId=c04770273&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/830272-B21.yaml b/module-types/HPE/830272-B21.yaml
index 18ca4218..3e5df36f 100644
--- a/module-types/HPE/830272-B21.yaml
+++ b/module-types/HPE/830272-B21.yaml
@@ -1,8 +1,8 @@
 ---
 manufacturer: HPE
-model: 830272-B21
+model: HPE PSU 1600W Flex Slot Power Supply
 part_number: 830272-B21
-comments: '[HPE 1600W Flex Slot Platinum Hot Plug Low Halogen Power Supply Kit | Hardware Specs | HPE]https://www.hpe.com/psnow/doc/c04346217.html'
+comments: '[HPE 1600W Flex Slot Platinum Hot Plug Low Halogen Power Supply Kit | Hardware Specs | HPE](https://www.hpe.com/psnow/doc/c04346217.html)'
 power-ports:
   - name: Power {module}
     type: iec-60320-c16
diff --git a/module-types/HPE/865408-B21.yaml b/module-types/HPE/865408-B21.yaml
index 63d083cc..c632cc99 100644
--- a/module-types/HPE/865408-B21.yaml
+++ b/module-types/HPE/865408-B21.yaml
@@ -1,9 +1,9 @@
 ---
 manufacturer: HPE
-model: 865408-B21
+model: HPE PSU 500W Flex Slot Power Supply
 part_number: 865408-B21
-comments: '[HPE 500W Flex Slot Platinum Hot Plug Low Halogen Power Supply Kit | Hardware Specs | HPE]https://www.hpe.com/psnow/doc/c04346217.html'
+comments: '[HPE 500W Flex Slot Platinum Hot Plug Low Halogen Power Supply Kit | Hardware Specs | HPE](https://www.hpe.com/psnow/doc/c04346217.html)'
 power-ports:
   - name: Power {module}
     type: iec-60320-c16
-    maximum_draw: 557
+    maximum_draw: 500
diff --git a/module-types/HPE/865414-B21.yaml b/module-types/HPE/865414-B21.yaml
index 6736bcf7..c3a17624 100644
--- a/module-types/HPE/865414-B21.yaml
+++ b/module-types/HPE/865414-B21.yaml
@@ -1,6 +1,6 @@
 ---
 manufacturer: HPE
-model: 865414-B21
+model: HPE PSU 800W Flex Slot Power Supply
 part_number: 865414-B21
 weight: 3.99
 weight_unit: lb
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
new file mode 100644
index 00000000..2fadd9b6
--- /dev/null
+++ b/module-types/HPE/HPE-Ethernet-1Gb-4-port-331i-LOM-Adapter.yaml
@@ -0,0 +1,14 @@
+---
+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