diff --git a/device-types/HPE/Aruba-EC-L-H.yaml b/device-types/HPE/Aruba-EC-L-H.yaml
index 0fbdd3cfd..68d3054df 100644
--- a/device-types/HPE/Aruba-EC-L-H.yaml
+++ b/device-types/HPE/Aruba-EC-L-H.yaml
@@ -14,15 +14,6 @@ console-ports:
   - name: console
     type: de-9
     label: console
-power-ports:
-  - name: PS1
-    type: iec-60320-c14
-    maximum_draw: 404
-    label: PS1
-  - name: PS2
-    type: iec-60320-c14
-    maximum_draw: 404
-    label: PS2
 interfaces:
   - name: tlan0
     type: 10gbase-x-sfpp
@@ -50,3 +41,10 @@ interfaces:
     type: 1000base-t
     mgmt_only: true
     label: mgmt1
+module-bays:
+  - name: PS1
+    position: '1'
+    label: PS1
+  - name: PS2
+    position: '2'
+    label: PS2
diff --git a/device-types/HPE/Aruba-EC-M-H-AC.yaml b/device-types/HPE/Aruba-EC-M-H-AC.yaml
index 9172586ec..87edd9191 100644
--- a/device-types/HPE/Aruba-EC-M-H-AC.yaml
+++ b/device-types/HPE/Aruba-EC-M-H-AC.yaml
@@ -14,13 +14,6 @@ console-ports:
   - name: console
     type: rj-45
     label: console
-power-ports:
-  - name: PS1
-    type: iec-60320-c14
-    maximum_draw: 153
-  - name: PS2
-    type: iec-60320-c14
-    maximum_draw: 153
 interfaces:
   - name: mgmt0
     type: 1000base-t
@@ -66,3 +59,8 @@ interfaces:
   - name: wan3
     type: 1000base-t
     label: wan3
+module-bays:
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'
\ No newline at end of file
diff --git a/device-types/HPE/Aruba-EC-S-P-AC.yaml b/device-types/HPE/Aruba-EC-S-P-AC.yaml
index 66182ee5d..cfc649ba0 100644
--- a/device-types/HPE/Aruba-EC-S-P-AC.yaml
+++ b/device-types/HPE/Aruba-EC-S-P-AC.yaml
@@ -14,13 +14,6 @@ console-ports:
   - name: console
     type: rj-45
     label: console
-power-ports:
-  - name: PS1
-    type: iec-60320-c14
-    maximum_draw: 111
-  - name: PS2
-    type: iec-60320-c14
-    maximum_draw: 111
 interfaces:
   - name: mgmt0
     type: 1000base-t
@@ -66,3 +59,8 @@ interfaces:
   - name: wan3
     type: 1000base-t
     label: wan3
+module-bays:
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'
diff --git a/device-types/HPE/Aruba-EC-S-P-DC.yaml b/device-types/HPE/Aruba-EC-S-P-DC.yaml
index 05224337b..420f31af8 100644
--- a/device-types/HPE/Aruba-EC-S-P-DC.yaml
+++ b/device-types/HPE/Aruba-EC-S-P-DC.yaml
@@ -14,13 +14,6 @@ console-ports:
   - name: console
     type: rj-45
     label: console
-power-ports:
-  - name: PS1
-    type: dc-terminal
-    maximum_draw: 103
-  - name: PS2
-    type: dc-terminal
-    maximum_draw: 103
 interfaces:
   - name: mgmt0
     type: 1000base-t
@@ -66,3 +59,8 @@ interfaces:
   - name: wan3
     type: 1000base-t
     label: wan3
+module-bays:
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'
diff --git a/device-types/HPE/Aruba-EC-XL-H.yaml b/device-types/HPE/Aruba-EC-XL-H.yaml
index 401e84ae4..341631cd6 100644
--- a/device-types/HPE/Aruba-EC-XL-H.yaml
+++ b/device-types/HPE/Aruba-EC-XL-H.yaml
@@ -14,15 +14,6 @@ console-ports:
   - name: console
     type: de-9
     label: console
-power-ports:
-  - name: PS1
-    type: iec-60320-c14
-    maximum_draw: 435
-    label: PS1
-  - name: PS2
-    type: iec-60320-c14
-    maximum_draw: 435
-    label: PS2
 interfaces:
   - name: tlan0
     type: 10gbase-x-sfpp
@@ -50,3 +41,10 @@ interfaces:
     type: 1000base-t
     mgmt_only: true
     label: mgmt1
+module-bays:
+  - name: PS1
+    position: '1'
+    label: PS1
+  - name: PS2
+    position: '2'
+    label: PS2
\ No newline at end of file
diff --git a/module-types/HPE/Aruba-EC-H-PSU-800W.yaml b/module-types/HPE/Aruba-EC-H-PSU-800W.yaml
new file mode 100644
index 000000000..b14388057
--- /dev/null
+++ b/module-types/HPE/Aruba-EC-H-PSU-800W.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: HPE
+model: Aruba EC-H-PSU-800W
+part_number: 500646-001 / JZ887A
+comments: Compatible with Aruba EC-L-H (404W) and EC-XL-H (435W)
+power-ports:
+  - name: PS{module}
+    type: iec-60320-c14
+    maximum_draw: 435W
diff --git a/module-types/HPE/Aruba-EC-M-H-PSU-AC.yaml b/module-types/HPE/Aruba-EC-M-H-PSU-AC.yaml
new file mode 100644
index 000000000..0e18c8453
--- /dev/null
+++ b/module-types/HPE/Aruba-EC-M-H-PSU-AC.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: HPE
+model: Aruba EC-M-H-PSU-AC
+part_number: 500615-001
+comments: Compatible with Aruba EC-M-H
+power-ports:
+  - name: PS{module}
+    type: iec-60320-c14
+    maximum_draw: 153
diff --git a/module-types/HPE/Aruba-EC-S-P-PSU-AC.yaml b/module-types/HPE/Aruba-EC-S-P-PSU-AC.yaml
new file mode 100644
index 000000000..72e18ad0f
--- /dev/null
+++ b/module-types/HPE/Aruba-EC-S-P-PSU-AC.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: HPE
+model: Aruba EC-S-P-PSU-AC
+part_number: 500615-001
+comments: Compatible with Aruba EC-S-P (AC)
+power-ports:
+  - name: PS{module}
+    type: iec-60320-c14
+    maximum_draw: 111
diff --git a/module-types/HPE/Aruba-EC-S-P-PSU-DC.yaml b/module-types/HPE/Aruba-EC-S-P-PSU-DC.yaml
new file mode 100644
index 000000000..83e54c482
--- /dev/null
+++ b/module-types/HPE/Aruba-EC-S-P-PSU-DC.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: HPE
+model: Aruba EC-S-P-PSU-DC
+part_number: 500619-001
+comments: Compatible with Aruba EC-S-P (DC)
+power-ports:
+  - name: PS{module}
+    type: dc-terminal
+    maximum_draw: 103