diff --git a/device-types/HPE/FlexFabric-5710-24SFPP-6QSFPP-or-2QSFP28.yaml b/device-types/HPE/FlexFabric-5710-24SFPP-6QSFPP-or-2QSFP28.yaml
new file mode 100644
index 000000000..2025e2869
--- /dev/null
+++ b/device-types/HPE/FlexFabric-5710-24SFPP-6QSFPP-or-2QSFP28.yaml
@@ -0,0 +1,111 @@
+---
+manufacturer: HPE
+model: FlexFabric 5710 24SFP+ 6QSFP+ or 2QSFP28
+slug: hpe-flexfabric-5710-24sfpp-6qsfpp-or-2qsfp28
+part_number: JL587A
+u_height: 1
+is_full_depth: false
+comments: '[HPE FlexFabric 5710 Switch Series - Specification](https://www.hpe.com/psnow/doc/a00045647enw.html?jumpid=in_pdp-psnow-qs)'
+weight: 10
+weight_unit: kg
+console-ports:
+  - name: console
+    type: rj-45
+  - name: usb
+    type: usb-mini-b
+module-bays:
+  - name: PSU1
+    position: PSU1
+  - name: PSU2
+    position: PSU2
+  - name: Fan1
+    position: Fan1
+  - name: Fan2
+    position: Fan2
+  - name: Fan3
+    position: Fan3
+  - name: Fan4
+    position: Fan4
+interfaces:
+  - name: M-GigabitEthernet0/0/0
+    type: 1000base-t
+    mgmt_only: true
+  - name: M-GigabitEthernet0/0/1
+    type: 1000base-x-sfp
+    mgmt_only: true
+  - name: Ten-GigabitEthernet1/0/0
+    type: 10gbase-t
+  - name: Ten-GigabitEthernet1/0/1
+    type: 10gbase-t
+  - name: Ten-GigabitEthernet1/0/2
+    type: 10gbase-t
+  - name: Ten-GigabitEthernet1/0/3
+    type: 10gbase-t
+  - name: Ten-GigabitEthernet1/0/4
+    type: 10gbase-t
+  - name: Ten-GigabitEthernet1/0/5
+    type: 10gbase-t
+  - name: Ten-GigabitEthernet1/0/6
+    type: 10gbase-t
+  - name: Ten-GigabitEthernet1/0/7
+    type: 10gbase-t
+  - name: Ten-GigabitEthernet1/0/8
+    type: 10gbase-t
+  - name: Ten-GigabitEthernet1/0/9
+    type: 10gbase-t
+  - name: Ten-GigabitEthernet1/0/10
+    type: 10gbase-t
+  - name: Ten-GigabitEthernet1/0/11
+    type: 10gbase-t
+  - name: Ten-GigabitEthernet1/0/12
+    type: 10gbase-t
+  - name: Ten-GigabitEthernet1/0/13
+    type: 10gbase-t
+  - name: Ten-GigabitEthernet1/0/14
+    type: 10gbase-t
+  - name: Ten-GigabitEthernet1/0/15
+    type: 10gbase-t
+  - name: Ten-GigabitEthernet1/0/16
+    type: 10gbase-t
+  - name: Ten-GigabitEthernet1/0/17
+    type: 10gbase-t
+  - name: Ten-GigabitEthernet1/0/18
+    type: 10gbase-t
+  - name: Ten-GigabitEthernet1/0/19
+    type: 10gbase-t
+  - name: Ten-GigabitEthernet1/0/20
+    type: 10gbase-t
+  - name: Ten-GigabitEthernet1/0/21
+    type: 10gbase-t
+  - name: Ten-GigabitEthernet1/0/22
+    type: 10gbase-t
+  - name: Ten-GigabitEthernet1/0/23
+    type: 10gbase-t
+  - name: Ten-GigabitEthernet1/0/24
+    type: 10gbase-t
+  - name: FortyGigE1/0/25
+    type: 40gbase-x-qsfpp
+  - name: FortyGigE1/0/26
+    type: 40gbase-x-qsfpp
+  - name: FortyGigE1/0/27
+    type: 40gbase-x-qsfpp
+  - name: FortyGigE1/0/28
+    type: 40gbase-x-qsfpp
+  - name: FortyGigE1/0/29
+    type: 40gbase-x-qsfpp
+  - name: FortyGigE1/0/30
+    type: 40gbase-x-qsfpp
+# or
+#   - name: FortyGigE1/0/25
+#     type: 40gbase-x-qsfp28
+#   - name: FortyGigE1/0/26
+#     type: 40gbase-x-qsfp28
+#   - name: FortyGigE1/0/27
+#     type: 40gbase-x-qsfp28
+#   - name: HundredGigE1/0/28
+#     type: 100gbase-x-qsfp28
+# or
+#   - name: HundredGigE1/0/25
+#     type: 100gbase-x-qsfp28
+#   - name: HundredGigE1/0/26
+#     type: 100gbase-x-qsfp28
diff --git a/module-types/HPE/JL589A.yaml b/module-types/HPE/JL589A.yaml
new file mode 100644
index 000000000..7250abbbe
--- /dev/null
+++ b/module-types/HPE/JL589A.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: HPE
+model: HPE FlexFabric 5710 250W Front-to-Back AC Power Supply
+part_number: JL589A
+comments: HPE FlexFabric 5710 250W Front-to-Back AC Power Supply
+power-ports:
+  - name: PS {module}
+    type: iec-60320-c14
+    maximum_draw: 250
diff --git a/module-types/HPE/JL594A.yaml b/module-types/HPE/JL594A.yaml
new file mode 100644
index 000000000..48394f820
--- /dev/null
+++ b/module-types/HPE/JL594A.yaml
@@ -0,0 +1,5 @@
+---
+manufacturer: HPE
+model: HPE FlexFabric X721 Front-to-Back Fan Tray
+part_number: JL594A
+comments: HPE FlexFabric X721 Front-to-Back Fan Tray