diff --git a/device-types/HPE/5510-48G-4SFPP-HI.yaml b/device-types/HPE/5510-48G-4SFPP-HI.yaml
new file mode 100644
index 00000000..699da2f9
--- /dev/null
+++ b/device-types/HPE/5510-48G-4SFPP-HI.yaml
@@ -0,0 +1,175 @@
+---
+manufacturer: HPE
+model: 5510 48G 4SFP+ HI
+slug: 5510-48G-4SFPP-HI
+part_number: JH146A
+u_height: 1
+is_full_depth: false
+console-ports:
+  - name: console
+    type: rj-45
+module-bays:
+  - name: Power 1
+    position: '1'
+  - name: Power 2
+    position: '2'
+interfaces:
+  - name: M-GigabitEthernet0/0/0
+    type: 1000base-t
+    mgmt_only: true
+  - name: GigabitEthernet1/0/1
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/2
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/3
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/4
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/5
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/6
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/7
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/8
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/9
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/10
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/11
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/12
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/13
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/14
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/15
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/16
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/17
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/18
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/19
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/20
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/21
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/22
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/23
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/24
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/25
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/26
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/27
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/28
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/29
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/30
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/31
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/32
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/33
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/34
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/35
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/36
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/37
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/38
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/39
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/40
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/41
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/42
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/43
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/44
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/45
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/46
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/47
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/48
+    type: 1000base-t
+    mgmt_only: false
+  - name: Ten-GigabitEthernet1/0/49
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+  - name: Ten-GigabitEthernet1/0/50
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+  - name: Ten-GigabitEthernet1/0/51
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+  - name: Ten-GigabitEthernet1/0/52
+    type: 10gbase-x-sfpp
+    mgmt_only: false
diff --git a/device-types/HPE/5510-48G-POEP-4SFPP-HI.yaml b/device-types/HPE/5510-48G-POEP-4SFPP-HI.yaml
new file mode 100644
index 00000000..3e10efbd
--- /dev/null
+++ b/device-types/HPE/5510-48G-POEP-4SFPP-HI.yaml
@@ -0,0 +1,175 @@
+---
+manufacturer: HPE
+model: 5510 48G PoE+ 4SFP+ HI
+slug: 5510-48G-POEP-4SFPP-HI
+part_number: JH148A
+u_height: 1
+is_full_depth: false
+console-ports:
+  - name: console
+    type: rj-45
+module-bays:
+  - name: Power 1
+    position: '1'
+  - name: Power 2
+    position: '2'
+interfaces:
+  - name: M-GigabitEthernet0/0/0
+    type: 1000base-t
+    mgmt_only: true
+  - name: GigabitEthernet1/0/1
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/2
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/3
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/4
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/5
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/6
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/7
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/8
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/9
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/10
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/11
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/12
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/13
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/14
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/15
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/16
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/17
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/18
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/19
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/20
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/21
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/22
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/23
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/24
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/25
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/26
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/27
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/28
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/29
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/30
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/31
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/32
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/33
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/34
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/35
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/36
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/37
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/38
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/39
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/40
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/41
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/42
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/43
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/44
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/45
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/46
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/47
+    type: 1000base-t
+    mgmt_only: false
+  - name: GigabitEthernet1/0/48
+    type: 1000base-t
+    mgmt_only: false
+  - name: Ten-GigabitEthernet1/0/49
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+  - name: Ten-GigabitEthernet1/0/50
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+  - name: Ten-GigabitEthernet1/0/51
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+  - name: Ten-GigabitEthernet1/0/52
+    type: 10gbase-x-sfpp
+    mgmt_only: false
diff --git a/module-types/HPE/X361.yaml b/module-types/HPE/X361.yaml
new file mode 100644
index 00000000..abcb7b59
--- /dev/null
+++ b/module-types/HPE/X361.yaml
@@ -0,0 +1,8 @@
+---
+manufacturer: HPE
+model: X361 150W AC Power Supply
+part_number: JD362B
+power-ports:
+  - name: Power {module}
+    type: iec-60320-c14
+    maximum_draw: 150
diff --git a/module-types/HPE/X362.yaml b/module-types/HPE/X362.yaml
new file mode 100644
index 00000000..66898edc
--- /dev/null
+++ b/module-types/HPE/X362.yaml
@@ -0,0 +1,8 @@
+---
+manufacturer: HPE
+model: X362 720W AC PoE Power Supply
+part_number: JG544A
+power-ports:
+  - name: Power {module}
+    type: iec-60320-c16
+    maximum_draw: 670