diff --git a/device-types/HPE/Aruba-2930M-24G.yaml b/device-types/HPE/Aruba-2930M-24G.yaml
index f6161687..22e4dfe6 100644
--- a/device-types/HPE/Aruba-2930M-24G.yaml
+++ b/device-types/HPE/Aruba-2930M-24G.yaml
@@ -5,11 +5,18 @@ slug: hpe-aruba-2930m-24g
 part_number: JL319A
 u_height: 1
 is_full_depth: false
-power-ports:
+comments: '[Aruba 2930M Switch Series Datasheet](https://www.arubanetworks.com/assets/ds/DS_2930MSwitchSeries.pdf)'
+weight: 9.81
+weight_unit: lb
+module-bays:
+  - name: Uplink
+    position: '1'
+  - name: Stacking Module
+    position: '2'
   - name: PS1
-    type: iec-60320-c14
-    maximum_draw: 49
-    allocated_draw: 34
+    position: '1'
+  - name: PS2
+    position: '2'
 console-ports:
   - name: Console
     type: rj-45
diff --git a/device-types/HPE/Aruba-2930M-48G-PoEP.yaml b/device-types/HPE/Aruba-2930M-48G-PoEP.yaml
index bc58bc73..060c7d48 100644
--- a/device-types/HPE/Aruba-2930M-48G-PoEP.yaml
+++ b/device-types/HPE/Aruba-2930M-48G-PoEP.yaml
@@ -9,6 +9,10 @@ comments: '[Aruba 2930M Switch Series Datasheet](https://www.arubanetworks.com/a
 weight: 10.25
 weight_unit: lb
 module-bays:
+  - name: Uplink
+    position: '1'
+  - name: Stacking Module
+    position: '2'
   - name: PS1
     position: '1'
   - name: PS2
diff --git a/device-types/HPE/Aruba-2930M-48G.yaml b/device-types/HPE/Aruba-2930M-48G.yaml
index 1c1cb46f..3dfd9657 100644
--- a/device-types/HPE/Aruba-2930M-48G.yaml
+++ b/device-types/HPE/Aruba-2930M-48G.yaml
@@ -9,6 +9,10 @@ comments: '[Aruba 2930M 48G 1-slot Switch Data sheet](https://www.hpe.com/psnow/
 weight: 10.14
 weight_unit: lb
 module-bays:
+  - name: Uplink
+    position: '1'
+  - name: Stacking Module
+    position: '2'
   - name: PS1
     position: '1'
   - name: PS2
diff --git a/device-types/HPE/Aruba-3810M-24G-1-slot-Switch.yaml b/device-types/HPE/Aruba-3810M-24G-1-slot-Switch.yaml
index 74bd4928..2cba964a 100644
--- a/device-types/HPE/Aruba-3810M-24G-1-slot-Switch.yaml
+++ b/device-types/HPE/Aruba-3810M-24G-1-slot-Switch.yaml
@@ -12,6 +12,8 @@ weight_unit: kg
 module-bays:
   - name: Network Module
     position: '1'
+  - name: Stacking Module
+    position: '2'
   - name: PS1
     position: '1'
   - name: PS2
diff --git a/device-types/HPE/Aruba-3810M-40G-8SR.yaml b/device-types/HPE/Aruba-3810M-40G-8SR.yaml
index 2edb0395..e9424097 100644
--- a/device-types/HPE/Aruba-3810M-40G-8SR.yaml
+++ b/device-types/HPE/Aruba-3810M-40G-8SR.yaml
@@ -5,15 +5,18 @@ slug: hpe-aruba-3810m-40g-8sr
 part_number: JL076A
 u_height: 1
 is_full_depth: false
-power-ports:
+comments: '[Aruba 3810 Switch Series Datasheet](https://www.arubanetworks.com/assets/ds/DS_3810SwitchSeries.pdf)'
+weight: 6.17
+weight_unit: kg
+module-bays:
+  - name: Network Module
+    position: '1'
+  - name: Stacking Module
+    position: '2'
   - name: PS1
-    type: iec-60320-c14
-    maximum_draw: 190
-    allocated_draw: 158
+    position: '1'
   - name: PS2
-    type: iec-60320-c14
-    maximum_draw: 190
-    allocated_draw: 158
+    position: '2'
 console-ports:
   - name: Console
     type: rj-45
diff --git a/device-types/HPE/Aruba-3810M-48G-PoEP-1-slot.yaml b/device-types/HPE/Aruba-3810M-48G-PoEP-1-slot.yaml
index da3581bc..a19ee031 100644
--- a/device-types/HPE/Aruba-3810M-48G-PoEP-1-slot.yaml
+++ b/device-types/HPE/Aruba-3810M-48G-PoEP-1-slot.yaml
@@ -12,6 +12,8 @@ weight_unit: kg
 module-bays:
   - name: Network Module
     position: '1'
+  - name: Stacking Module
+    position: '2'
   - name: PS1
     position: '1'
   - name: PS2