diff --git a/device-types/HPE/Aruba-2530-24-PoEP.yml b/device-types/HPE/Aruba-2530-24-PoEP.yml
index daa90dac2..3fb3b726e 100644
--- a/device-types/HPE/Aruba-2530-24-PoEP.yml
+++ b/device-types/HPE/Aruba-2530-24-PoEP.yml
@@ -1,13 +1,14 @@
 ---
 manufacturer: HPE
-model: Aruba 2530-24-PoEP Switch
+model: Aruba 2530-24-PoE+
 slug: hpe-aruba-2530-24-poep
 part_number: J9779A
 u_height: 1
 is_full_depth: false
+comments: '[Aruba 2530 Switch Series - Specifications](https://support.hpe.com/hpesc/public/docDisplay?docId=emr_na-c03624915#N11BE7)'
 weight:
-  - value: 8
-    unit: lb
+  - value: 3.8
+    unit: kg
 console-ports:
   - name: console
     type: rj-45
diff --git a/device-types/HPE/Aruba-2530-24.yaml b/device-types/HPE/Aruba-2530-24.yaml
new file mode 100644
index 000000000..d96c445cc
--- /dev/null
+++ b/device-types/HPE/Aruba-2530-24.yaml
@@ -0,0 +1,75 @@
+---
+manufacturer: HPE
+model: Aruba 2530-24
+slug: hpe-aruba-2530-24
+part_number: J9782A
+u_height: 1
+is_full_depth: false
+comments: '[Aruba 2530 Switch Series - Specifications](https://support.hpe.com/hpesc/public/docDisplay?docId=emr_na-c03624915#N1040D)'
+weight:
+  - value: 2.6
+    unit: kg
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 15
+console-ports:
+  - name: Console
+    type: rj-45
+interfaces:
+  - name: '1'
+    type: 100base-tx
+  - name: '2'
+    type: 100base-tx
+  - name: '3'
+    type: 100base-tx
+  - name: '4'
+    type: 100base-tx
+  - name: '5'
+    type: 100base-tx
+  - name: '6'
+    type: 100base-tx
+  - name: '7'
+    type: 100base-tx
+  - name: '8'
+    type: 100base-tx
+  - name: '9'
+    type: 100base-tx
+  - name: '10'
+    type: 100base-tx
+  - name: '11'
+    type: 100base-tx
+  - name: '12'
+    type: 100base-tx
+  - name: '13'
+    type: 100base-tx
+  - name: '14'
+    type: 100base-tx
+  - name: '15'
+    type: 100base-tx
+  - name: '16'
+    type: 100base-tx
+  - name: '17'
+    type: 100base-tx
+  - name: '18'
+    type: 100base-tx
+  - name: '19'
+    type: 100base-tx
+  - name: '20'
+    type: 100base-tx
+  - name: '21'
+    type: 100base-tx
+  - name: '22'
+    type: 100base-tx
+  - name: '23'
+    type: 100base-tx
+  - name: '24'
+    type: 100base-tx
+  - name: '25'
+    type: 1000base-t
+  - name: '26'
+    type: 1000base-t
+  - name: '27'
+    type: 1000base-x-sfp
+  - name: '28'
+    type: 1000base-x-sfp
diff --git a/device-types/HPE/Aruba-2530-24G-PoEP.yaml b/device-types/HPE/Aruba-2530-24G-PoEP.yaml
index 3292e1504..7f331a307 100644
--- a/device-types/HPE/Aruba-2530-24G-PoEP.yaml
+++ b/device-types/HPE/Aruba-2530-24G-PoEP.yaml
@@ -5,6 +5,10 @@ slug: hpe-aruba-2530-24g-poep
 part_number: J9773A
 u_height: 1
 is_full_depth: false
+comments: '[Aruba 2530 Switch Series - Specifications](https://support.hpe.com/hpesc/public/docDisplay?docId=emr_na-c03624915#N127FD)'
+weight:
+  - value: 4
+    unit: kg
 power-ports:
   - name: PS1
     type: iec-60320-c14
diff --git a/device-types/HPE/Aruba-2530-24G.yaml b/device-types/HPE/Aruba-2530-24G.yaml
index 01651012f..ea7d508b9 100644
--- a/device-types/HPE/Aruba-2530-24G.yaml
+++ b/device-types/HPE/Aruba-2530-24G.yaml
@@ -3,19 +3,19 @@ manufacturer: HPE
 model: Aruba 2530-24G
 slug: hpe-aruba-2530-24g
 part_number: J9776A
-u_height: 1.0
-is_full_depth: true
-comments: 'Quickspecs : https://support.hpe.com/hpesc/public/docDisplay?docId=emr_na-c03624915#N11007'
+u_height: 1
+is_full_depth: false
+comments: '[Aruba 2530 Switch Series - Specifications](https://support.hpe.com/hpesc/public/docDisplay?docId=emr_na-c03624915#N11007)'
 weight:
   - value: 6.1
     unit: lb
-console-ports:
-  - name: Console
-    type: rj-45
 power-ports:
   - name: PS1
     type: iec-60320-c14
-    maximum_draw: 50
+    maximum_draw: 48
+console-ports:
+  - name: Console
+    type: rj-45
 interfaces:
   - name: '1'
     type: 1000base-t
diff --git a/device-types/HPE/Aruba-2530-48-PoEP.yml b/device-types/HPE/Aruba-2530-48-PoEP.yml
index 623e41981..30ae45042 100644
--- a/device-types/HPE/Aruba-2530-48-PoEP.yml
+++ b/device-types/HPE/Aruba-2530-48-PoEP.yml
@@ -5,6 +5,7 @@ slug: hpe-aruba-2530-48-poep
 part_number: J9778A
 u_height: 1
 is_full_depth: false
+comments: '[Aruba 2530 Switch Series - Specifications](https://support.hpe.com/hpesc/public/docDisplay?docId=emr_na-c03624915#N11FF3)'
 weight:
   - value: 10
     unit: lb
diff --git a/device-types/HPE/Aruba-2530-48.yaml b/device-types/HPE/Aruba-2530-48.yaml
new file mode 100644
index 000000000..d8762f13a
--- /dev/null
+++ b/device-types/HPE/Aruba-2530-48.yaml
@@ -0,0 +1,123 @@
+---
+manufacturer: HPE
+model: Aruba 2530-48
+slug: hpe-aruba-2530-48
+part_number: J9781A
+u_height: 1
+is_full_depth: false
+comments: '[Aruba 2530 Switch Series - Specifications](https://support.hpe.com/hpesc/public/docDisplay?docId=emr_na-c03624915#N10805)'
+weight:
+  - value: 2.6
+    unit: kg
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 30
+console-ports:
+  - name: Console
+    type: rj-45
+interfaces:
+  - name: '1'
+    type: 100base-tx
+  - name: '2'
+    type: 100base-tx
+  - name: '3'
+    type: 100base-tx
+  - name: '4'
+    type: 100base-tx
+  - name: '5'
+    type: 100base-tx
+  - name: '6'
+    type: 100base-tx
+  - name: '7'
+    type: 100base-tx
+  - name: '8'
+    type: 100base-tx
+  - name: '9'
+    type: 100base-tx
+  - name: '10'
+    type: 100base-tx
+  - name: '11'
+    type: 100base-tx
+  - name: '12'
+    type: 100base-tx
+  - name: '13'
+    type: 100base-tx
+  - name: '14'
+    type: 100base-tx
+  - name: '15'
+    type: 100base-tx
+  - name: '16'
+    type: 100base-tx
+  - name: '17'
+    type: 100base-tx
+  - name: '18'
+    type: 100base-tx
+  - name: '19'
+    type: 100base-tx
+  - name: '20'
+    type: 100base-tx
+  - name: '21'
+    type: 100base-tx
+  - name: '22'
+    type: 100base-tx
+  - name: '23'
+    type: 100base-tx
+  - name: '24'
+    type: 100base-tx
+  - name: '25'
+    type: 100base-tx
+  - name: '26'
+    type: 100base-tx
+  - name: '27'
+    type: 100base-tx
+  - name: '28'
+    type: 100base-tx
+  - name: '29'
+    type: 100base-tx
+  - name: '30'
+    type: 100base-tx
+  - name: '31'
+    type: 100base-tx
+  - name: '32'
+    type: 100base-tx
+  - name: '33'
+    type: 100base-tx
+  - name: '34'
+    type: 100base-tx
+  - name: '35'
+    type: 100base-tx
+  - name: '36'
+    type: 100base-tx
+  - name: '37'
+    type: 100base-tx
+  - name: '38'
+    type: 100base-tx
+  - name: '39'
+    type: 100base-tx
+  - name: '40'
+    type: 100base-tx
+  - name: '41'
+    type: 100base-tx
+  - name: '42'
+    type: 100base-tx
+  - name: '43'
+    type: 100base-tx
+  - name: '44'
+    type: 100base-tx
+  - name: '45'
+    type: 100base-tx
+  - name: '46'
+    type: 100base-tx
+  - name: '47'
+    type: 100base-tx
+  - name: '48'
+    type: 100base-tx
+  - name: '49'
+    type: 1000base-t
+  - name: '50'
+    type: 1000base-t
+  - name: '51'
+    type: 1000base-x-sfp
+  - name: '52'
+    type: 1000base-x-sfp
diff --git a/device-types/HPE/Aruba-2530-48G-PoEP.yaml b/device-types/HPE/Aruba-2530-48G-PoEP.yaml
index 9767ca634..73a5a76a8 100644
--- a/device-types/HPE/Aruba-2530-48G-PoEP.yaml
+++ b/device-types/HPE/Aruba-2530-48G-PoEP.yaml
@@ -5,6 +5,10 @@ slug: hpe-aruba-2530-48g-poep
 part_number: J9772A
 u_height: 1
 is_full_depth: false
+comments: '[Aruba 2530 Switch Series - Specifications](https://support.hpe.com/hpesc/public/docDisplay?docId=emr_na-c03624915#N12C00)'
+weight:
+  - value: 2.6
+    unit: kg
 power-ports:
   - name: PS1
     type: iec-60320-c14
diff --git a/device-types/HPE/Aruba-2530-48G.yaml b/device-types/HPE/Aruba-2530-48G.yaml
index b8eac74c5..95e71c300 100644
--- a/device-types/HPE/Aruba-2530-48G.yaml
+++ b/device-types/HPE/Aruba-2530-48G.yaml
@@ -2,13 +2,17 @@
 manufacturer: HPE
 model: Aruba 2530-48G
 slug: hpe-aruba-2530-48g
-part_number: J9781A
+part_number: J9775A
 u_height: 1
 is_full_depth: false
+comments: '[Aruba 2530 Switch Series - Specifications](https://support.hpe.com/hpesc/public/docDisplay?docId=emr_na-c03624915#N113F7)'
+weight:
+  - value: 3
+    unit: kg
 power-ports:
   - name: PS1
     type: iec-60320-c14
-    maximum_draw: 30
+    maximum_draw: 60
 console-ports:
   - name: Console
     type: rj-45
diff --git a/device-types/HPE/Aruba-2530-8-PoEP.yml b/device-types/HPE/Aruba-2530-8-PoEP.yml
index 941a510dc..cf08f705c 100644
--- a/device-types/HPE/Aruba-2530-8-PoEP.yml
+++ b/device-types/HPE/Aruba-2530-8-PoEP.yml
@@ -5,6 +5,7 @@ slug: hpe-aruba-2530-8-poep
 part_number: J9780A
 u_height: 1
 is_full_depth: false
+comments: '[Aruba 2530 Switch Series - Specifications](https://support.hpe.com/hpesc/public/docDisplay?docId=emr_na-c03624915#N117E5)'
 weight:
   - value: 2
     unit: lb
diff --git a/device-types/HPE/Aruba-2530-8G-PoEP.yaml b/device-types/HPE/Aruba-2530-8G-PoEP.yaml
index ce4d2a56e..6728c2be8 100644
--- a/device-types/HPE/Aruba-2530-8G-PoEP.yaml
+++ b/device-types/HPE/Aruba-2530-8G-PoEP.yaml
@@ -5,6 +5,10 @@ slug: hpe-aruba-2530-8g-poep
 part_number: J9774A
 u_height: 1
 is_full_depth: false
+comments: '[Aruba 2530 Switch Series - Specifications](https://support.hpe.com/hpesc/public/docDisplay?docId=emr_na-c03624915#N123F6)'
+weight:
+  - value: 1
+    unit: kg
 power-ports:
   - name: PS1
     type: dc-terminal