diff --git a/device-types/HPE/ProLiant-DL180-Gen6.yaml b/device-types/HPE/ProLiant-DL180-Gen6.yaml
new file mode 100644
index 00000000..32a164f4
--- /dev/null
+++ b/device-types/HPE/ProLiant-DL180-Gen6.yaml
@@ -0,0 +1,39 @@
+---
+manufacturer: HPE
+model: ProLiant DL180 Gen6
+slug: hp_dl180_g6
+u_height: 2.0
+is_full_depth: true
+part_number: 590638-371
+comments: '[HP ProLiant DL180 G6 QuickSpecs](https://www.hpe.com/psnow/doc/c04284378)'
+weight:
+  - value: 16.80
+    unit: kg
+console-ports:
+  - name: Serial
+    type: de-9
+  - name: VGA
+    type: other
+module-bays:
+  - name: PSU1
+    position: PSU1
+  - name: PSU2
+    position: PSU2
+  - name: PCIe1
+    position: PCIe1
+  - name: PCIe2
+    position: PCIe2
+  - name: PCIe3
+    position: PCIe3
+  - name: PCIe4
+    position: PCIe4
+interfaces:
+  - name: Gig-E 1
+    type: 1000base-t
+    mgmt_only: false
+  - name: Gig-E 2
+    type: 1000base-t
+    mgmt_only: false
+  - name: iLO
+    type: 1000base-t
+    mgmt_only: true
diff --git a/device-types/HPE/ProLiant-DL360-Gen7.yaml b/device-types/HPE/ProLiant-DL360-Gen7.yaml
index 0cd2aa7c..b75cbd5b 100644
--- a/device-types/HPE/ProLiant-DL360-Gen7.yaml
+++ b/device-types/HPE/ProLiant-DL360-Gen7.yaml
@@ -16,8 +16,6 @@ module-bays:
     position: PSU1
   - name: PSU2
     position: PSU2
-  - name: FlexLOM
-    position: FlexLOM
   - name: PCIe1
     position: PCIe1
   - name: PCIe2
diff --git a/device-types/HPE/ProLiant-DL360e-Gen8.yaml b/device-types/HPE/ProLiant-DL360e-Gen8.yaml
new file mode 100644
index 00000000..936e7c96
--- /dev/null
+++ b/device-types/HPE/ProLiant-DL360e-Gen8.yaml
@@ -0,0 +1,45 @@
+---
+manufacturer: HPE
+model: ProLiant DL360e Gen8
+slug: hp_dl360e_g8
+u_height: 1.0
+is_full_depth: true
+part_number: 661189-B21
+comments: '[HP ProLiant DL360e Gen8 QuickSpecs](https://www.hpe.com/psnow/doc/c04284501)'
+weight:
+  - value: 17.92
+    unit: kg
+console-ports:
+  - name: Serial
+    type: de-9
+  - name: VGA
+    type: other
+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
+    mgmt_only: false
+  - name: Gig-E 2
+    type: 1000base-t
+    mgmt_only: false
+  - name: Gig-E 3
+    type: 1000base-t
+    mgmt_only: false
+  - name: Gig-E 4
+    type: 1000base-t
+    mgmt_only: false
+  - name: iLO
+    type: 1000base-t
+    mgmt_only: true
diff --git a/device-types/HPE/ProLiantD-L380-Gen7.yml b/device-types/HPE/ProLiant-DL380-Gen7.yml
similarity index 100%
rename from device-types/HPE/ProLiantD-L380-Gen7.yml
rename to device-types/HPE/ProLiant-DL380-Gen7.yml