diff --git a/device-types/HPE/Aruba-6300F-24G-4SFP56.yaml b/device-types/HPE/Aruba-6300F-24G-4SFP56.yaml
index b019952d6..764bfc45c 100644
--- a/device-types/HPE/Aruba-6300F-24G-4SFP56.yaml
+++ b/device-types/HPE/Aruba-6300F-24G-4SFP56.yaml
@@ -7,6 +7,7 @@ u_height: 1
 is_full_depth: false
 front_image: true
 rear_image: true
+comments: '[Aruba 6300 Switch Series](https://www.arubanetworks.com/assets/ds/DS_6300Series.pdf)'
 console-ports:
   - name: usb-c
     type: usb-c
diff --git a/device-types/HPE/Aruba-6300F-24G-POE4-4SFP56.yaml b/device-types/HPE/Aruba-6300F-24G-POE4-4SFP56.yaml
index 997c49829..d3527cd3d 100644
--- a/device-types/HPE/Aruba-6300F-24G-POE4-4SFP56.yaml
+++ b/device-types/HPE/Aruba-6300F-24G-POE4-4SFP56.yaml
@@ -7,6 +7,7 @@ u_height: 1
 is_full_depth: false
 front_image: true
 rear_image: true
+comments: '[Aruba 6300 Switch Series](https://www.arubanetworks.com/assets/ds/DS_6300Series.pdf)'
 console-ports:
   - name: usb-c
     type: usb-c
diff --git a/device-types/HPE/Aruba-6300F-48G-4SFP56.yaml b/device-types/HPE/Aruba-6300F-48G-4SFP56.yaml
index 12a817502..30f0ea465 100644
--- a/device-types/HPE/Aruba-6300F-48G-4SFP56.yaml
+++ b/device-types/HPE/Aruba-6300F-48G-4SFP56.yaml
@@ -7,6 +7,7 @@ u_height: 1
 is_full_depth: false
 front_image: true
 rear_image: true
+comments: '[Aruba 6300 Switch Series](https://www.arubanetworks.com/assets/ds/DS_6300Series.pdf)'
 console-ports:
   - name: usb-c
     type: usb-c
diff --git a/device-types/HPE/Aruba-6300F-48G-POE4-4SFP56.yaml b/device-types/HPE/Aruba-6300F-48G-POE4-4SFP56.yaml
index 515a259dc..43b8eeeba 100644
--- a/device-types/HPE/Aruba-6300F-48G-POE4-4SFP56.yaml
+++ b/device-types/HPE/Aruba-6300F-48G-POE4-4SFP56.yaml
@@ -7,6 +7,7 @@ u_height: 1
 is_full_depth: false
 front_image: true
 rear_image: true
+comments: '[Aruba 6300 Switch Series](https://www.arubanetworks.com/assets/ds/DS_6300Series.pdf)'
 console-ports:
   - name: usb-c
     type: usb-c
diff --git a/device-types/HPE/Aruba-6300M-24G-4SFP56.yaml b/device-types/HPE/Aruba-6300M-24G-4SFP56.yaml
index a8b655faa..b6e995e76 100644
--- a/device-types/HPE/Aruba-6300M-24G-4SFP56.yaml
+++ b/device-types/HPE/Aruba-6300M-24G-4SFP56.yaml
@@ -7,20 +7,21 @@ u_height: 1
 is_full_depth: false
 front_image: true
 rear_image: true
+comments: '[Aruba 6300 Switch Series](https://www.arubanetworks.com/assets/ds/DS_6300Series.pdf)'
 console-ports:
   - name: usb-c
     type: usb-c
   - name: usb-ble
     type: usb-a
-power-ports:
-  - name: ps1
-    type: iec-60320-c14
-    maximum_draw: 250
-    allocated_draw: 64
-  - name: ps2
-    type: iec-60320-c14
-    maximum_draw: 250
-    allocated_draw: 64
+module-bays:
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'
+  - name: FAN1
+    position: '1'
+  - name: FAN2
+    position: '2'
 interfaces:
   - name: 1/1/1
     type: 1000base-t
diff --git a/device-types/HPE/Aruba-6300M-24G-POE4-4SFP56.yaml b/device-types/HPE/Aruba-6300M-24G-POE4-4SFP56.yaml
index 647595313..a8db56591 100644
--- a/device-types/HPE/Aruba-6300M-24G-POE4-4SFP56.yaml
+++ b/device-types/HPE/Aruba-6300M-24G-POE4-4SFP56.yaml
@@ -7,20 +7,21 @@ u_height: 1
 is_full_depth: false
 front_image: true
 rear_image: true
+comments: '[Aruba 6300 Switch Series](https://www.arubanetworks.com/assets/ds/DS_6300Series.pdf)'
 console-ports:
   - name: usb-c
     type: usb-c
   - name: usb-ble
     type: usb-a
-power-ports:
-  - name: ps1
-    type: iec-60320-c14
-    maximum_draw: 250
-    allocated_draw: 76
-  - name: ps2
-    type: iec-60320-c14
-    maximum_draw: 250
-    allocated_draw: 76
+module-bays:
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'
+  - name: FAN1
+    position: '1'
+  - name: FAN2
+    position: '2'
 interfaces:
   - name: 1/1/1
     type: 1000base-t
diff --git a/device-types/HPE/Aruba-6300M-24GSR-POE6-4SFP56.yaml b/device-types/HPE/Aruba-6300M-24GSR-POE6-4SFP56.yaml
index 9b06af800..19e8c59a9 100644
--- a/device-types/HPE/Aruba-6300M-24GSR-POE6-4SFP56.yaml
+++ b/device-types/HPE/Aruba-6300M-24GSR-POE6-4SFP56.yaml
@@ -5,20 +5,21 @@ slug: hpe-aruba-6300m-24gsr-poe6-4sfp56
 part_number: JL660A
 u_height: 1
 is_full_depth: false
+comments: '[Aruba 6300 Switch Series](https://www.arubanetworks.com/assets/ds/DS_6300Series.pdf)'
 console-ports:
   - name: usb-c
     type: usb-c
   - name: usb-ble
     type: usb-a
-power-ports:
-  - name: ps1
-    type: iec-60320-c14
-    maximum_draw: 250
-    allocated_draw: 137
-  - name: ps2
-    type: iec-60320-c14
-    maximum_draw: 250
-    allocated_draw: 137
+module-bays:
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'
+  - name: FAN1
+    position: '1'
+  - name: FAN2
+    position: '2'
 interfaces:
   - name: 1/1/1
     type: 5gbase-t
diff --git a/device-types/HPE/Aruba-6300M-24SFPP-4SFP56.yaml b/device-types/HPE/Aruba-6300M-24SFPP-4SFP56.yaml
index 61832c8ce..40324e874 100644
--- a/device-types/HPE/Aruba-6300M-24SFPP-4SFP56.yaml
+++ b/device-types/HPE/Aruba-6300M-24SFPP-4SFP56.yaml
@@ -7,20 +7,21 @@ u_height: 1
 is_full_depth: false
 front_image: true
 rear_image: true
+comments: '[Aruba 6300 Switch Series](https://www.arubanetworks.com/assets/ds/DS_6300Series.pdf)'
 console-ports:
   - name: usb-c
     type: usb-c
   - name: usb-ble
     type: usb-a
-power-ports:
-  - name: ps1
-    type: iec-60320-c14
-    maximum_draw: 250
-    allocated_draw: 85
-  - name: ps2
-    type: iec-60320-c14
-    maximum_draw: 250
-    allocated_draw: 85
+module-bays:
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'
+  - name: FAN1
+    position: '1'
+  - name: FAN2
+    position: '2'
 interfaces:
   - name: 1/1/1
     type: 10gbase-x-sfpp
diff --git a/device-types/HPE/Aruba-6300M-48G-4SFP56.yaml b/device-types/HPE/Aruba-6300M-48G-4SFP56.yaml
index 0de94a345..05ce234b5 100644
--- a/device-types/HPE/Aruba-6300M-48G-4SFP56.yaml
+++ b/device-types/HPE/Aruba-6300M-48G-4SFP56.yaml
@@ -7,20 +7,21 @@ u_height: 1
 is_full_depth: false
 front_image: true
 rear_image: true
+comments: '[Aruba 6300 Switch Series](https://www.arubanetworks.com/assets/ds/DS_6300Series.pdf)'
 console-ports:
   - name: usb-c
     type: usb-c
   - name: usb-ble
     type: usb-a
-power-ports:
-  - name: ps1
-    type: iec-60320-c14
-    maximum_draw: 250
-    allocated_draw: 75
-  - name: ps2
-    type: iec-60320-c14
-    maximum_draw: 250
-    allocated_draw: 75
+module-bays:
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'
+  - name: FAN1
+    position: '1'
+  - name: FAN2
+    position: '2'
 interfaces:
   - name: 1/1/1
     type: 1000base-t
diff --git a/device-types/HPE/Aruba-6300M-48G-POE4-4SFP56.yaml b/device-types/HPE/Aruba-6300M-48G-POE4-4SFP56.yaml
index b140fdf52..68b64dc59 100644
--- a/device-types/HPE/Aruba-6300M-48G-POE4-4SFP56.yaml
+++ b/device-types/HPE/Aruba-6300M-48G-POE4-4SFP56.yaml
@@ -7,20 +7,21 @@ u_height: 1
 is_full_depth: false
 front_image: true
 rear_image: true
+comments: '[Aruba 6300 Switch Series](https://www.arubanetworks.com/assets/ds/DS_6300Series.pdf)'
 console-ports:
   - name: usb-c
     type: usb-c
   - name: usb-ble
     type: usb-a
-power-ports:
-  - name: ps1
-    type: iec-60320-c14
-    maximum_draw: 250
-    allocated_draw: 90
-  - name: ps2
-    type: iec-60320-c14
-    maximum_draw: 250
-    allocated_draw: 90
+module-bays:
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'
+  - name: FAN1
+    position: '1'
+  - name: FAN2
+    position: '2'
 interfaces:
   - name: 1/1/1
     type: 1000base-t
diff --git a/device-types/HPE/Aruba-6300M-48GSR-POE6-4SFP56.yaml b/device-types/HPE/Aruba-6300M-48GSR-POE6-4SFP56.yaml
index a6279fd65..7d26a10a4 100644
--- a/device-types/HPE/Aruba-6300M-48GSR-POE6-4SFP56.yaml
+++ b/device-types/HPE/Aruba-6300M-48GSR-POE6-4SFP56.yaml
@@ -5,20 +5,21 @@ slug: hpe-aruba-6300m-48gsr-poe6-4sfp56
 part_number: JL659A
 u_height: 1
 is_full_depth: false
+comments: '[Aruba 6300 Switch Series](https://www.arubanetworks.com/assets/ds/DS_6300Series.pdf)'
 console-ports:
   - name: usb-c
     type: usb-c
   - name: usb-ble
     type: usb-a
-power-ports:
-  - name: ps1
-    type: iec-60320-c14
-    maximum_draw: 250
-    allocated_draw: 199
-  - name: ps2
-    type: iec-60320-c14
-    maximum_draw: 250
-    allocated_draw: 199
+module-bays:
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'
+  - name: FAN1
+    position: '1'
+  - name: FAN2
+    position: '2'
 interfaces:
   - name: 1/1/1
     type: 5gbase-t
diff --git a/device-types/HPE/Aruba-6300M-48SR5-POE8-2SFP56-2SFP28.yaml b/device-types/HPE/Aruba-6300M-48SR5-POE8-2SFP56-2SFP28.yaml
index fdbbaa3f2..446c54dbc 100644
--- a/device-types/HPE/Aruba-6300M-48SR5-POE8-2SFP56-2SFP28.yaml
+++ b/device-types/HPE/Aruba-6300M-48SR5-POE8-2SFP56-2SFP28.yaml
@@ -4,23 +4,26 @@ model: Aruba 6300M-48SR5-POE8-2SFP56-2SFP28
 slug: hpe-aruba-6300m-48sr5-poe8-2sfp56-2sfp28
 part_number: R8S90A
 u_height: 1.0
-is_full_depth: true
+is_full_depth: false
 weight: 5.48
 weight_unit: kg
+comments: '[Aruba 6300 Switch Series](https://www.arubanetworks.com/assets/ds/DS_6300Series.pdf)'
 console-ports:
   - name: rj45-console
     type: rj-45
   - name: usb-c
     type: usb-c
-power-ports:
-  - name: ps1
-    type: iec-60320-c14
-    maximum_draw: 250
-    allocated_draw: 90
-  - name: ps2
-    type: iec-60320-c14
-    maximum_draw: 250
-    allocated_draw: 90
+  - name: usb-ble
+    type: usb-a
+module-bays:
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'
+  - name: FAN1
+    position: '1'
+  - name: FAN2
+    position: '2'
 interfaces:
   - name: 1/1/1
     type: 5gbase-t
diff --git a/module-types/HPE/Aruba-JL086A.yaml b/module-types/HPE/Aruba-JL086A.yaml
new file mode 100644
index 000000000..7f2873689
--- /dev/null
+++ b/module-types/HPE/Aruba-JL086A.yaml
@@ -0,0 +1,11 @@
+---
+manufacturer: HPE
+model: Aruba JL086A
+part_number: JL086A
+weight: 830
+weight_unit: g
+comments: Aruba X372 54VDC 680W 100-240VAC Power Supply
+power-ports:
+  - name: 1/{module}
+    type: iec-60320-c16
+    maximum_draw: 680
diff --git a/module-types/HPE/Aruba-JL087A.yaml b/module-types/HPE/Aruba-JL087A.yaml
index d56d1dfe4..3a84a864b 100644
--- a/module-types/HPE/Aruba-JL087A.yaml
+++ b/module-types/HPE/Aruba-JL087A.yaml
@@ -2,8 +2,10 @@
 manufacturer: HPE
 model: Aruba JL087A
 part_number: JL087A
-comments: Aruba X372 1050W AC Power Supply
+weight: 880
+weight_unit: g
+comments: Aruba X372 54VDC 1050W 110-240VAC Power Supply
 power-ports:
-  - name: PS{module}
-    type: iec-60320-c14
+  - name: 1/{module}
+    type: iec-60320-c16
     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..6df8136c2
--- /dev/null
+++ b/module-types/HPE/Aruba-JL670A.yaml
@@ -0,0 +1,11 @@
+---
+manufacturer: HPE
+model: Aruba JL670A
+part_number: JL670A
+weight: 997.9
+weight_unit: g
+comments: Aruba X372 54VDC 1600W 110-240VAC Power Supply
+power-ports:
+  - name: 1/{module}
+    type: iec-60320-c16
+    maximum_draw: 1600