diff --git a/device-types/HPE/Aruba-2930M-24G-PoEP.yaml b/device-types/HPE/Aruba-2930M-24G-PoEP.yaml
new file mode 100644
index 000000000..dc324dfea
--- /dev/null
+++ b/device-types/HPE/Aruba-2930M-24G-PoEP.yaml
@@ -0,0 +1,136 @@
+---
+manufacturer: HPE
+model: Aruba 2930M-24G-PoE+
+slug: hpe-aruba-2930m-24g-poep
+part_number: JL320A
+u_height: 1
+is_full_depth: false
+comments: "IEEE 802.3at Type 2 PoE+ maximum power budget: **840W**. Compatible PSUs:\r\n\r\n- **JL086A** HPE Aruba Networking X372 54V DC **680W** 110-240V\
+  \ AC\r\n- **JL087A** HPE Aruba Networking X372 54V DC **1050W** 110-240V AC\r\n\r\n[HPE Aruba 2930M Switch Series Datasheet](https://www.hpe.com/psnow/doc/a00001977enw)"
+weight: 9.92
+weight_unit: lb
+module-bays:
+  - name: Uplink
+    position: A
+  - name: Stacking Module
+    position: Stack
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'
+console-ports:
+  - name: Console
+    type: rj-45
+  - name: USB Console
+    type: usb-micro-b
+interfaces:
+  - name: oobm
+    type: 100base-tx
+    mgmt_only: true
+    description: Out of Band Management (oobm) interface
+  - name: '1'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '2'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '3'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '4'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '5'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '6'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '7'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '8'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '9'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '10'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '11'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '12'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '13'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '14'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '15'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '16'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '17'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '18'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '19'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '20'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  # Dual personality ports option 1
+  - name: '21'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '22'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '23'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '24'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  # Dual personality ports option 2
+  # - name: '21'
+  #   type: 1000base-x-sfp
+  # - name: '22'
+  #   type: 1000base-x-sfp
+  # - name: '23'
+  #   type: 1000base-x-sfp
+  # - name: '24'
+  #   type: 1000base-x-sfp
diff --git a/device-types/HPE/Aruba-2930M-24G.yaml b/device-types/HPE/Aruba-2930M-24G.yaml
index 4330beb10..de65cc6aa 100644
--- a/device-types/HPE/Aruba-2930M-24G.yaml
+++ b/device-types/HPE/Aruba-2930M-24G.yaml
@@ -25,9 +25,10 @@ console-ports:
   - name: USB Console
     type: usb-micro-b
 interfaces:
-  - name: Management
-    type: 1000base-t
+  - name: oobm
+    type: 100base-tx
     mgmt_only: true
+    description: Out of Band Management (oobm) interface
   - name: '1'
     type: 1000base-t
   - name: '2'
diff --git a/device-types/HPE/Aruba-2930M-24SR-PoE6.yaml b/device-types/HPE/Aruba-2930M-24SR-PoE6.yaml
new file mode 100644
index 000000000..962e53316
--- /dev/null
+++ b/device-types/HPE/Aruba-2930M-24SR-PoE6.yaml
@@ -0,0 +1,126 @@
+---
+manufacturer: HPE
+model: Aruba 2930M-24SR-PoE6
+slug: hpe-aruba-2930m-24sr-poe6
+part_number: R0M68A
+u_height: 1
+is_full_depth: false
+comments: "IEEE 802.3bt Type 3 PoE6 maximum power budget: **1440W**. Compatible PSUs:\r\n\r\n- **JL086A** HPE Aruba Networking X372 54V DC **680W** 110-240V\
+  \ AC\r\n- **JL087A** HPE Aruba Networking X372 54V DC **1050W** 110-240V AC\r\n\r\n[HPE Aruba 2930M Switch Series Datasheet](https://www.hpe.com/psnow/doc/a00001977enw)"
+weight: 9.96
+weight_unit: lb
+module-bays:
+  - name: Uplink
+    position: A
+  - name: Stacking Module
+    position: Stack
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'
+console-ports:
+  - name: Console
+    type: rj-45
+  - name: USB Console
+    type: usb-micro-b
+interfaces:
+  - name: oobm
+    type: 100base-tx
+    mgmt_only: true
+    description: Out of Band Management (oobm) interface
+  - name: '1'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '2'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '3'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '4'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '5'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '6'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '7'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '8'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '9'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '10'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '11'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '12'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '13'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '14'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '15'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '16'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '17'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '18'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '19'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '20'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '21'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '22'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '23'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '24'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
diff --git a/device-types/HPE/Aruba-2930M-24SR-PoEP.yaml b/device-types/HPE/Aruba-2930M-24SR-PoEP.yaml
index a4bebb16f..7e47fff3a 100644
--- a/device-types/HPE/Aruba-2930M-24SR-PoEP.yaml
+++ b/device-types/HPE/Aruba-2930M-24SR-PoEP.yaml
@@ -1,13 +1,14 @@
 ---
 manufacturer: HPE
-model: Aruba 2930M-24SR-PoEP
+model: Aruba 2930M-24SR-PoE+
 slug: hpe-aruba-2930m-24sr-poep
 part_number: JL324A
 u_height: 1
 is_full_depth: false
 front_image: true
-comments: '[Aruba 2930M Switch Series Datasheet](https://www.arubanetworks.com/assets/ds/DS_2930MSwitchSeries.pdf)'
-weight: 9.90
+comments: "IEEE 802.3at Type 2 PoE+ maximum power budget: **840W**. Compatible PSUs:\r\n\r\n- **JL086A** HPE Aruba Networking X372 54V DC **680W** 110-240V\
+  \ AC\r\n- **JL087A** HPE Aruba Networking X372 54V DC **1050W** 110-240V AC\r\n\r\n[HPE Aruba 2930M Switch Series Datasheet](https://www.hpe.com/psnow/doc/a00001977enw)"
+weight: 9.92
 weight_unit: lb
 module-bays:
   - name: Uplink
@@ -24,54 +25,103 @@ console-ports:
   - name: USB Console
     type: usb-micro-b
 interfaces:
-  - name: Management
+  - name: oobm
     type: 100base-tx
     mgmt_only: true
+    description: Out of Band Management (oobm) interface
   - name: '1'
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '2'
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '3'
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '4'
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '5'
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '6'
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '7'
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '8'
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '9'
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '10'
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '11'
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '12'
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '13'
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '14'
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '15'
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '16'
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '17'
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '18'
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '19'
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '20'
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '21'
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '22'
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '23'
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '24'
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
diff --git a/device-types/HPE/Aruba-2930M-40G-8SR-PoE6.yaml b/device-types/HPE/Aruba-2930M-40G-8SR-PoE6.yaml
new file mode 100644
index 000000000..9128a40dc
--- /dev/null
+++ b/device-types/HPE/Aruba-2930M-40G-8SR-PoE6.yaml
@@ -0,0 +1,232 @@
+---
+manufacturer: HPE
+model: Aruba 2930M-40G-8SR-PoE6
+slug: hpe-aruba-2930m-40g-8sr-poe6
+part_number: R0M67A
+u_height: 1
+is_full_depth: false
+comments: "IEEE 802.3bt Type 3 PoE6 maximum power budget: **1440W**. Compatible PSUs:\r\n\r\n- **JL086A** HPE Aruba Networking X372 54V DC **680W** 110-240V\
+  \ AC\r\n- **JL087A** HPE Aruba Networking X372 54V DC **1050W** 110-240V AC\r\n\r\n[HPE Aruba 2930M Switch Series Datasheet](https://www.hpe.com/psnow/doc/a00001977enw)"
+weight: 9.81
+weight_unit: lb
+module-bays:
+  - name: Uplink
+    position: A
+  - name: Stacking Module
+    position: Stack
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'
+console-ports:
+  - name: Console
+    type: rj-45
+  - name: USB Console
+    type: usb-micro-b
+interfaces:
+  - name: oobm
+    type: 100base-tx
+    mgmt_only: true
+    description: Out of Band Management (oobm) interface
+  - name: '1'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '2'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '3'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '4'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '5'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '6'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '7'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '8'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '9'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '10'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '11'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '12'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '13'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '14'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '15'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '16'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '17'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '18'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '19'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '20'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '21'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '22'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '23'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '24'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '25'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '26'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '27'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '28'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '29'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '30'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '31'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '32'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '33'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '34'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '35'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '36'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '37'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '38'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '39'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '40'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '41'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '42'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '43'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '44'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+ # Dual personality ports option 1
+  - name: '45'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '46'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '47'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: '48'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+ # Dual personality ports option 2
+ # - name: '45'
+ #   type: 1000base-x-sfp
+ # - name: '46'
+ #   type: 1000base-x-sfp
+ # - name: '47'
+ #   type: 1000base-x-sfp
+ # - name: '48'
+ #   type: 1000base-x-sfp
diff --git a/device-types/HPE/Aruba-2930M-40G-8SR-PoEP.yaml b/device-types/HPE/Aruba-2930M-40G-8SR-PoEP.yaml
new file mode 100644
index 000000000..78d461720
--- /dev/null
+++ b/device-types/HPE/Aruba-2930M-40G-8SR-PoEP.yaml
@@ -0,0 +1,232 @@
+---
+manufacturer: HPE
+model: Aruba 2930M-40G-8SR-PoE+
+slug: hpe-aruba-2930m-40g-8sr-poep
+part_number: JL323A
+u_height: 1
+is_full_depth: false
+comments: "IEEE 802.3at Type 2 PoE+ maximum power budget: **1440W**. Compatible PSUs:\r\n\r\n- **JL086A** HPE Aruba Networking X372 54V DC **680W** 110-240V\
+  \ AC\r\n- **JL087A** HPE Aruba Networking X372 54V DC **1050W** 110-240V AC\r\n\r\n[HPE Aruba 2930M Switch Series Datasheet](https://www.hpe.com/psnow/doc/a00001977enw)"
+weight: 9.90
+weight_unit: lb
+module-bays:
+  - name: Uplink
+    position: A
+  - name: Stacking Module
+    position: Stack
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'
+console-ports:
+  - name: Console
+    type: rj-45
+  - name: USB Console
+    type: usb-micro-b
+interfaces:
+  - name: oobm
+    type: 100base-tx
+    mgmt_only: true
+    description: Out of Band Management (oobm) interface
+  - name: '1'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '2'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '3'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '4'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '5'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '6'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '7'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '8'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '9'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '10'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '11'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '12'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '13'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '14'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '15'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '16'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '17'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '18'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '19'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '20'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '21'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '22'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '23'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '24'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '25'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '26'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '27'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '28'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '29'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '30'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '31'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '32'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '33'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '34'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '35'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '36'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '37'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '38'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '39'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '40'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '41'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '42'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '43'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '44'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+ # Dual personality ports option 1
+  - name: '45'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '46'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '47'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '48'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+ # Dual personality ports option 2
+ # - name: '45'
+ #   type: 1000base-x-sfp
+ # - name: '46'
+ #   type: 1000base-x-sfp
+ # - name: '47'
+ #   type: 1000base-x-sfp
+ # - name: '48'
+ #   type: 1000base-x-sfp
diff --git a/device-types/HPE/Aruba-2930M-48G-PoEP.yaml b/device-types/HPE/Aruba-2930M-48G-PoEP.yaml
index 842fcdb3a..e2e8328f9 100644
--- a/device-types/HPE/Aruba-2930M-48G-PoEP.yaml
+++ b/device-types/HPE/Aruba-2930M-48G-PoEP.yaml
@@ -1,13 +1,14 @@
 ---
 manufacturer: HPE
-model: Aruba 2930M-48G-POE+
+model: Aruba 2930M-48G-PoE+
 slug: hpe-aruba-2930m-48g-poep
 part_number: JL322A
 u_height: 1
 is_full_depth: false
 front_image: true
 rear_image: true
-comments: '[Aruba 2930M Switch Series Datasheet](https://www.arubanetworks.com/assets/ds/DS_2930MSwitchSeries.pdf)'
+comments: "IEEE 802.3at Type 2 PoE+ maximum power budget: **1440W**. Compatible PSUs:\r\n\r\n- **JL086A** HPE Aruba Networking X372 54V DC **680W** 110-240V\
+  \ AC\r\n- **JL087A** HPE Aruba Networking X372 54V DC **1050W** 110-240V AC\r\n\r\n[HPE Aruba 2930M Switch Series Datasheet](https://www.hpe.com/psnow/doc/a00001977enw)"
 weight: 10.25
 weight_unit: lb
 module-bays:
@@ -25,102 +26,209 @@ console-ports:
   - name: USB Console
     type: usb-micro-b
 interfaces:
-  - name: Management
+  - name: oobm
     type: 100base-tx
     mgmt_only: true
+    description: Out of Band Management (oobm) interface
   - name: '1'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '2'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '3'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '4'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '5'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '6'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '7'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '8'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '9'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '10'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '11'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '12'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '13'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '14'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '15'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '16'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '17'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '18'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '19'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '20'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '21'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '22'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '23'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '24'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '25'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '26'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '27'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '28'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '29'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '30'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '31'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '32'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '33'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '34'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '35'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '36'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '37'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '38'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '39'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '40'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '41'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '42'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '43'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '44'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+ # Dual personality ports option 1
   - name: '45'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '46'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '47'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: '48'
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+ # Dual personality ports option 2
+ # - name: '45'
+ #   type: 1000base-x-sfp
+ # - name: '46'
+ #   type: 1000base-x-sfp
+ # - name: '47'
+ #   type: 1000base-x-sfp
+ # - name: '48'
+ #   type: 1000base-x-sfp
diff --git a/device-types/HPE/Aruba-2930M-48G.yaml b/device-types/HPE/Aruba-2930M-48G.yaml
index f790135ad..b13dfc64e 100644
--- a/device-types/HPE/Aruba-2930M-48G.yaml
+++ b/device-types/HPE/Aruba-2930M-48G.yaml
@@ -25,9 +25,10 @@ console-ports:
   - name: USB Console
     type: usb-micro-b
 interfaces:
-  - name: Management
+  - name: oobm
     type: 100base-tx
     mgmt_only: true
+    description: Out of Band Management (oobm) interface
   - name: '1'
     type: 1000base-t
   - name: '2'
@@ -114,6 +115,7 @@ interfaces:
     type: 1000base-t
   - name: '43'
     type: 1000base-t
+ # Dual personality ports option 1
   - name: '44'
     type: 1000base-t
   - name: '45'
@@ -124,3 +126,12 @@ interfaces:
     type: 1000base-t
   - name: '48'
     type: 1000base-t
+ # Dual personality ports option 2
+ # - name: '45'
+ #   type: 1000base-x-sfp
+ # - name: '46'
+ #   type: 1000base-x-sfp
+ # - name: '47'
+ #   type: 1000base-x-sfp
+ # - name: '48'
+ #   type: 1000base-x-sfp
diff --git a/module-types/HPE/Aruba-JL085A.yaml b/module-types/HPE/Aruba-JL085A.yaml
index 1bc1c88a7..1f37b1a21 100644
--- a/module-types/HPE/Aruba-JL085A.yaml
+++ b/module-types/HPE/Aruba-JL085A.yaml
@@ -1,8 +1,11 @@
 ---
 manufacturer: HPE
-model: Aruba JL085A
-part_number: JL085A
-comments: Aruba X371 250W AC Power Supply
+model: HPE Aruba Networking X371 PSU 250W non-PoE JL085A
+part_number: Aruba JL085A
+description: Hot Plug PSU for various HPE Aruba switches like the 3810M, 2930M and CX 6300M non-PoE models
+weight: 1.52
+weight_unit: lb
+comments: HPE Aruba Networking X371 12V DC **250W** 100-240V AC Power Supply.
 power-ports:
   - name: PS {module}
     type: iec-60320-c14
diff --git a/module-types/HPE/Aruba-JL086A.yaml b/module-types/HPE/Aruba-JL086A.yaml
new file mode 100644
index 000000000..5419f73bc
--- /dev/null
+++ b/module-types/HPE/Aruba-JL086A.yaml
@@ -0,0 +1,12 @@
+---
+manufacturer: HPE
+model: HPE Aruba Networking X372 PSU 680W PoE JL086A
+part_number: Aruba JL086A
+description: Hot Plug PSU for various HPE Aruba switches like the 3810M, 2930M and CX 6300M PoE models
+weight: 1.82
+weight_unit: lb
+comments: HPE Aruba Networking X372 54V DC **680W** 100-240V AC Power Supply.
+power-ports:
+  - name: PS {module}
+    type: iec-60320-c14
+    maximum_draw: 680
diff --git a/module-types/HPE/Aruba-JL087A.yaml b/module-types/HPE/Aruba-JL087A.yaml
new file mode 100644
index 000000000..1b75b2525
--- /dev/null
+++ b/module-types/HPE/Aruba-JL087A.yaml
@@ -0,0 +1,12 @@
+---
+manufacturer: HPE
+model: HPE Aruba Networking X372 PSU 1050W PoE JL087A
+part_number: Aruba JL087A
+description: Hot Plug PSU for various HPE Aruba switches like the 3810M, 2930M and CX 6300M PoE models
+weight: 1.94
+weight_unit: lb
+comments: HPE Aruba Networking X372 54V DC **1050W** 100-240V AC Power Supply.
+power-ports:
+  - name: PS {module}
+    type: iec-60320-c14
+    maximum_draw: 1050
diff --git a/module-types/HPE/Aruba-JL670A.yaml b/module-types/HPE/Aruba-JL670A.yaml
new file mode 100644
index 000000000..164f9f157
--- /dev/null
+++ b/module-types/HPE/Aruba-JL670A.yaml
@@ -0,0 +1,12 @@
+---
+manufacturer: HPE
+model: HPE Aruba Networking X372 PSU 1600W PoE JL670A
+part_number: Aruba JL670A
+description: Hot Plug PSU for HPE Aruba CX 6300M switch series for PoE models
+weight: 1.94
+weight_unit: lb
+comments: HPE Aruba Networking X372 54V DC **1600W** 100-240V AC Power Supply.
+power-ports:
+  - name: PS {module}
+    type: iec-60320-c14
+    maximum_draw: 1600
diff --git a/module-types/HPE/Aruba-JL757A.yaml b/module-types/HPE/Aruba-JL757A.yaml
new file mode 100644
index 000000000..91a248384
--- /dev/null
+++ b/module-types/HPE/Aruba-JL757A.yaml
@@ -0,0 +1,12 @@
+---
+manufacturer: HPE
+model: HPE Aruba Networking CX 6300M PSU 250W 36-72V input PoE JL758A
+part_number: Aruba JL757A
+description: Hot Plug PSU for HPE Aruba CX 6300M switch series for PoE models
+weight: 2.8
+weight_unit: kg
+comments: HPE Aruba Networking CX 6300M 250W 36-72VDC input **250W** Power Supply.
+power-ports:
+  - name: PS {module}
+    type: dc-terminal
+    maximum_draw: 250
diff --git a/module-types/HPE/Aruba-JL758A.yaml b/module-types/HPE/Aruba-JL758A.yaml
new file mode 100644
index 000000000..dfdb20c6a
--- /dev/null
+++ b/module-types/HPE/Aruba-JL758A.yaml
@@ -0,0 +1,12 @@
+---
+manufacturer: HPE
+model: HPE Aruba Networking CX 6300M PSU 1050W 36-72V input PoE JL758A
+part_number: Aruba JL758A
+description: Hot Plug PSU for HPE Aruba CX 6300M switch series for PoE models
+weight: 2.8
+weight_unit: kg
+comments: HPE Aruba Networking CX 6300M 1050W 36-72VDC input **1050W** Power Supply.
+power-ports:
+  - name: PS {module}
+    type: dc-terminal
+    maximum_draw: 1050