diff --git a/device-types/HPE/5406R-zl2.yaml b/device-types/HPE/5406R-zl2.yaml
index 1f4df17a6..635a14264 100644
--- a/device-types/HPE/5406R-zl2.yaml
+++ b/device-types/HPE/5406R-zl2.yaml
@@ -7,7 +7,9 @@ u_height: 4
 is_full_depth: false
 front_image: true
 rear_image: true
-airflow: front-to-rear
+weight: 11.11
+weight_unit: kg
+airflow: left-to-right
 comments: '[HP branded predecessor model of Aruba 5406R zl2 (J9821A)](https://www.hpe.com/psnow/doc/c04293383.html?jumpid=in_pdp-psnow-qs)'
 module-bays:
   - name: A
diff --git a/device-types/HPE/5412R-zl2.yaml b/device-types/HPE/5412R-zl2.yaml
index eae8e5ab4..280c5426e 100644
--- a/device-types/HPE/5412R-zl2.yaml
+++ b/device-types/HPE/5412R-zl2.yaml
@@ -7,7 +7,9 @@ u_height: 7
 is_full_depth: false
 front_image: true
 rear_image: true
-airflow: front-to-rear
+weight: 17.28
+weight_unit: kg
+airflow: left-to-right
 comments: '[HP branded predecessor model of Aruba 5412R zl2 (J9822A)](https://www.hpe.com/psnow/doc/c04293383.html?jumpid=in_pdp-psnow-qs)'
 module-bays:
   - name: A
diff --git a/device-types/HPE/Aruba-2530-8-PoEP.yml b/device-types/HPE/Aruba-2530-8-PoEP.yml
index a9a29b2fb..964a5ae75 100644
--- a/device-types/HPE/Aruba-2530-8-PoEP.yml
+++ b/device-types/HPE/Aruba-2530-8-PoEP.yml
@@ -34,11 +34,7 @@ interfaces:
     type: 100base-tx
   - name: '8'
     type: 100base-tx
-  - name: 9-RJ45
-    type: 1000base-t
-  - name: 10-RJ45
-    type: 1000base-t
-  - name: 9-SFP
+  - name: '9'
     type: 1000base-x-sfp
-  - name: 10-SFP
+  - name: '10'
     type: 1000base-x-sfp
diff --git a/device-types/HPE/Aruba-2530-8.yaml b/device-types/HPE/Aruba-2530-8.yaml
index 7a3c77214..61ee79828 100644
--- a/device-types/HPE/Aruba-2530-8.yaml
+++ b/device-types/HPE/Aruba-2530-8.yaml
@@ -32,11 +32,7 @@ interfaces:
     type: 100base-tx
   - name: '8'
     type: 100base-tx
-  - name: 9-RJ45
-    type: 100base-tx
-  - name: 10-RJ45
-    type: 100base-tx
-  - name: 9-SFP
+  - name: '9'
     type: 1000base-x-sfp
-  - name: 10-SFP
+  - name: '10'
     type: 1000base-x-sfp
diff --git a/device-types/HPE/Aruba-2530-8G-PoEP.yaml b/device-types/HPE/Aruba-2530-8G-PoEP.yaml
index 5c2e8ee1b..2445ac319 100644
--- a/device-types/HPE/Aruba-2530-8G-PoEP.yaml
+++ b/device-types/HPE/Aruba-2530-8G-PoEP.yaml
@@ -34,11 +34,7 @@ interfaces:
     type: 1000base-t
   - name: '8'
     type: 1000base-t
-  - name: 9-RJ45
-    type: 1000base-t
-  - name: 10-RJ45
-    type: 1000base-t
-  - name: 9-SFP
+  - name: '9'
     type: 1000base-x-sfp
-  - name: 10-SFP
+  - name: '10'
     type: 1000base-x-sfp
diff --git a/device-types/HPE/Aruba-2530-8G.yaml b/device-types/HPE/Aruba-2530-8G.yaml
index 7c272265b..8947dff3d 100644
--- a/device-types/HPE/Aruba-2530-8G.yaml
+++ b/device-types/HPE/Aruba-2530-8G.yaml
@@ -34,11 +34,7 @@ interfaces:
     type: 1000base-t
   - name: '8'
     type: 1000base-t
-  - name: 9-RJ45
-    type: 1000base-t
-  - name: 10-RJ45
-    type: 1000base-t
-  - name: 9-SFP
+  - name: '9'
     type: 1000base-x-sfp
-  - name: 10-SFP
+  - name: '10'
     type: 1000base-x-sfp
diff --git a/device-types/HPE/Aruba-5406R-zl2.yaml b/device-types/HPE/Aruba-5406R-zl2.yaml
index 884da7fc8..280d846cc 100644
--- a/device-types/HPE/Aruba-5406R-zl2.yaml
+++ b/device-types/HPE/Aruba-5406R-zl2.yaml
@@ -7,7 +7,9 @@ u_height: 4
 is_full_depth: false
 front_image: true
 rear_image: true
-airflow: front-to-rear
+weight: 11.11
+weight_unit: kg
+airflow: left-to-right
 comments: '[Aruba 5400R zl2 Switch Series](https://www.hpe.com/psnow/doc/c04293383.html?jumpid=in_pdp-psnow-qs)'
 module-bays:
   - name: A
diff --git a/device-types/HPE/Aruba-5412R-zl2.yaml b/device-types/HPE/Aruba-5412R-zl2.yaml
index 8d2ee0d90..fb3d2196c 100644
--- a/device-types/HPE/Aruba-5412R-zl2.yaml
+++ b/device-types/HPE/Aruba-5412R-zl2.yaml
@@ -7,7 +7,9 @@ u_height: 7
 is_full_depth: false
 front_image: true
 rear_image: true
-airflow: front-to-rear
+weight: 17.28
+weight_unit: kg
+airflow: left-to-right
 comments: '[Aruba 5400R zl2 Switch Series](https://www.hpe.com/psnow/doc/c04293383.html?jumpid=in_pdp-psnow-qs)'
 module-bays:
   - name: A
diff --git a/device-types/HPE/ProCurve-2520-24-PoE.yml b/device-types/HPE/ProCurve-2520-24-PoE.yml
new file mode 100644
index 000000000..9cc84aaca
--- /dev/null
+++ b/device-types/HPE/ProCurve-2520-24-PoE.yml
@@ -0,0 +1,80 @@
+---
+manufacturer: HPE
+model: ProCurve 2520-24-PoE
+slug: hpe-procurve-2520-24-poe
+part_number: J9138A
+u_height: 1
+is_full_depth: false
+front_image: true
+airflow: left-to-right
+comments: '[HP ProCurve 2520 PoE Switch Series - Overview](https://support.hpe.com/hpesc/public/docDisplay?docId=c02563899&docLocale=en_US)'
+weight: 3.2
+weight_unit: kg
+console-ports:
+  - name: console
+    type: rj-45
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 257
+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: 27T
+    type: 1000base-t
+  - name: 28T
+    type: 1000base-t
+  - name: 27S
+    type: 1000base-x-sfp
+  - name: 28S
+    type: 1000base-x-sfp
diff --git a/device-types/HPE/ProCurve-2520-8-PoE.yml b/device-types/HPE/ProCurve-2520-8-PoE.yml
new file mode 100644
index 000000000..68effa88f
--- /dev/null
+++ b/device-types/HPE/ProCurve-2520-8-PoE.yml
@@ -0,0 +1,40 @@
+---
+manufacturer: HPE
+model: ProCurve 2520-8-PoE
+slug: hpe-procurve-2520-8-poe
+part_number: J9137A
+u_height: 1
+is_full_depth: false
+front_image: true
+airflow: passive
+comments: '[HP ProCurve 2520 PoE Switch Series - Overview](https://support.hpe.com/hpesc/public/docDisplay?docId=c02563899&docLocale=en_US)'
+weight: 1.64
+weight_unit: kg
+console-ports:
+  - name: console
+    type: rj-45
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 86
+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: 1000base-x-sfp
+  - name: '10'
+    type: 1000base-x-sfp
diff --git a/device-types/HPE/ProCurve-2520G-24-PoE.yml b/device-types/HPE/ProCurve-2520G-24-PoE.yml
new file mode 100644
index 000000000..afb480435
--- /dev/null
+++ b/device-types/HPE/ProCurve-2520G-24-PoE.yml
@@ -0,0 +1,69 @@
+---
+manufacturer: HPE
+model: ProCurve 2520G-24-PoE
+slug: hpe-procurve-2520g-24-poe
+part_number: J9299A
+u_height: 1
+is_full_depth: false
+front_image: true
+airflow: left-to-right
+comments: "[HP ProCurve 2520G PoE Switch Series - Overview](https://support.hpe.com/hpesc/public/docDisplay?docId=c01922567&docLocale=en_US)\r\n[HP ProCurve\
+  \ 2520G PoE Switch Series - Specifications](https://support.hpe.com/hpesc/public/docDisplay?docLocale=en_US&docId=c01922596)"
+weight: 3.27
+weight_unit: kg
+console-ports:
+  - name: console
+    type: rj-45
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 260
+interfaces:
+  - name: '1'
+    type: 1000base-t
+  - name: '2'
+    type: 1000base-t
+  - name: '3'
+    type: 1000base-t
+  - name: '4'
+    type: 1000base-t
+  - name: '5'
+    type: 1000base-t
+  - name: '6'
+    type: 1000base-t
+  - name: '7'
+    type: 1000base-t
+  - name: '8'
+    type: 1000base-t
+  - name: '9'
+    type: 1000base-t
+  - name: '10'
+    type: 1000base-t
+  - name: '11'
+    type: 1000base-t
+  - name: '12'
+    type: 1000base-t
+  - name: '13'
+    type: 1000base-t
+  - name: '14'
+    type: 1000base-t
+  - name: '15'
+    type: 1000base-t
+  - name: '16'
+    type: 1000base-t
+  - name: '17'
+    type: 1000base-t
+  - name: '18'
+    type: 1000base-t
+  - name: '19'
+    type: 1000base-t
+  - name: '20'
+    type: 1000base-t
+  - 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/ProCurve-2520G-8-PoE.yml b/device-types/HPE/ProCurve-2520G-8-PoE.yml
new file mode 100644
index 000000000..5c983b206
--- /dev/null
+++ b/device-types/HPE/ProCurve-2520G-8-PoE.yml
@@ -0,0 +1,41 @@
+---
+manufacturer: HPE
+model: ProCurve 2520G-8-PoE
+slug: hpe-procurve-2520g-8-poe
+part_number: J9298A
+u_height: 1
+is_full_depth: false
+front_image: true
+airflow: passive
+comments: "[HP ProCurve 2520G PoE Switch Series - Overview](https://support.hpe.com/hpesc/public/docDisplay?docId=c01922567&docLocale=en_US)\r\n[HP ProCurve\
+  \ 2520G PoE Switch Series - Specifications](https://support.hpe.com/hpesc/public/docDisplay?docLocale=en_US&docId=c01922596)"
+weight: 1.66
+weight_unit: kg
+console-ports:
+  - name: console
+    type: rj-45
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 86
+interfaces:
+  - name: '1'
+    type: 1000base-t
+  - name: '2'
+    type: 1000base-t
+  - name: '3'
+    type: 1000base-t
+  - name: '4'
+    type: 1000base-t
+  - name: '5'
+    type: 1000base-t
+  - name: '6'
+    type: 1000base-t
+  - name: '7'
+    type: 1000base-t
+  - name: '8'
+    type: 1000base-t
+  - name: '9'
+    type: 1000base-x-sfp
+  - name: '10'
+    type: 1000base-x-sfp
diff --git a/device-types/HPE/ProCurve-2810-24G.yaml b/device-types/HPE/ProCurve-2810-24G.yaml
index 526f2d99f..6f30bee5e 100644
--- a/device-types/HPE/ProCurve-2810-24G.yaml
+++ b/device-types/HPE/ProCurve-2810-24G.yaml
@@ -5,6 +5,11 @@ slug: hpe-procurve-2810-24g
 part_number: J9021A
 u_height: 1
 is_full_depth: false
+front_image: true
+weight: 3.27
+weight_unit: kg
+airflow: left-to-right
+comments: '[HP 2810 Switch Series](https://support.hpe.com/hpesc/public/docDisplay?docId=c02504728&docLocale=en_US)'
 console-ports:
   - name: Console
     type: rj-45
@@ -54,10 +59,10 @@ interfaces:
   - name: '20'
     type: 1000base-t
   - name: '21'
-    type: 1000base-t
+    type: 1000base-x-sfp
   - name: '22'
-    type: 1000base-t
+    type: 1000base-x-sfp
   - name: '23'
-    type: 1000base-t
+    type: 1000base-x-sfp
   - name: '24'
-    type: 1000base-t
+    type: 1000base-x-sfp
diff --git a/device-types/HPE/ProCurve-2810-48G.yaml b/device-types/HPE/ProCurve-2810-48G.yaml
index cdc7e83d9..dde1776f8 100644
--- a/device-types/HPE/ProCurve-2810-48G.yaml
+++ b/device-types/HPE/ProCurve-2810-48G.yaml
@@ -5,6 +5,11 @@ slug: hpe-procurve-2810-48g
 part_number: J9022A
 u_height: 1
 is_full_depth: false
+front_image: true
+weight: 3.9
+weight_unit: kg
+airflow: left-to-right
+comments: '[HP 2810 Switch Series](https://support.hpe.com/hpesc/public/docDisplay?docId=c02504728&docLocale=en_US)'
 console-ports:
   - name: Console
     type: rj-45
@@ -102,10 +107,10 @@ interfaces:
   - name: '44'
     type: 1000base-t
   - name: '45'
-    type: 1000base-t
+    type: 1000base-x-sfp
   - name: '46'
-    type: 1000base-t
+    type: 1000base-x-sfp
   - name: '47'
-    type: 1000base-t
+    type: 1000base-x-sfp
   - name: '48'
-    type: 1000base-t
+    type: 1000base-x-sfp
diff --git a/device-types/HPE/ProCurve-5406zl.yaml b/device-types/HPE/ProCurve-5406zl.yaml
index 5f995df67..a5385d8a1 100644
--- a/device-types/HPE/ProCurve-5406zl.yaml
+++ b/device-types/HPE/ProCurve-5406zl.yaml
@@ -5,10 +5,12 @@ slug: hpe-procurve-5406zl
 part_number: J8697A
 u_height: 4
 is_full_depth: false
+front_image: true
+rear_image: true
 weight: 10.68
 weight_unit: kg
-airflow: front-to-rear
-comments: '[HP ProCurve Switch 5406zl Series](https://www.hp.com/hpinfo/newsroom/press_kits/2010/HPOptimizesAppDelivery/E5400zl_Switch_Series_Data_Sheet.pdf)'
+airflow: left-to-right
+comments: '[HP ProCurve Switch 5400zl Series](https://www.hp.com/hpinfo/newsroom/press_kits/2010/HPOptimizesAppDelivery/E5400zl_Switch_Series_Data_Sheet.pdf)'
 module-bays:
   - name: A
     position: A
@@ -31,12 +33,12 @@ module-bays:
   - name: MM1
     position: MM1
     description: Front Management Module Slot
-  - name: MM2
-    position: MM2
-    description: Front Management Module Slot
   - name: PS1
     position: PS1
     description: Rear PSU Slot
   - name: PS2
     position: PS2
     description: Rear PSU Slot
+  - name: Fan1
+    position: Fan1
+    description: Rear Fan Slot
diff --git a/device-types/HPE/ProCurve-5412zl.yaml b/device-types/HPE/ProCurve-5412zl.yaml
index 13854a3f6..a652222d8 100644
--- a/device-types/HPE/ProCurve-5412zl.yaml
+++ b/device-types/HPE/ProCurve-5412zl.yaml
@@ -5,10 +5,12 @@ slug: hpe-procurve-5412zl
 part_number: J8698A
 u_height: 7
 is_full_depth: false
+front_image: true
+rear_image: true
 weight: 15.85
 weight_unit: kg
-airflow: front-to-rear
-comments: '[HP ProCurve Switch 5406zl Series](https://www.hp.com/hpinfo/newsroom/press_kits/2010/HPOptimizesAppDelivery/E5400zl_Switch_Series_Data_Sheet.pdf)'
+airflow: left-to-right
+comments: '[HP ProCurve Switch 5400zl Series](https://www.hp.com/hpinfo/newsroom/press_kits/2010/HPOptimizesAppDelivery/E5400zl_Switch_Series_Data_Sheet.pdf)'
 module-bays:
   - name: A
     position: A
@@ -49,9 +51,6 @@ module-bays:
   - name: MM1
     position: MM1
     description: Front Management Module Slot
-  - name: MM2
-    position: MM2
-    description: Front Management Module Slot
   - name: PS1
     position: PS1
     description: Rear PSU Slot
@@ -62,5 +61,8 @@ module-bays:
     position: PS3
     description: Rear PSU Slot
   - name: PS4
-    position: PS5
+    position: PS4
     description: Rear PSU Slot
+  - name: Fan1
+    position: Fan1
+    description: Rear Fan Slot
diff --git a/elevation-images/HPE/hpe-procurve-2520-24-poe.front.png b/elevation-images/HPE/hpe-procurve-2520-24-poe.front.png
new file mode 100644
index 000000000..999a39288
Binary files /dev/null and b/elevation-images/HPE/hpe-procurve-2520-24-poe.front.png differ
diff --git a/elevation-images/HPE/hpe-procurve-2520-8-poe.front.png b/elevation-images/HPE/hpe-procurve-2520-8-poe.front.png
new file mode 100644
index 000000000..41070cf0a
Binary files /dev/null and b/elevation-images/HPE/hpe-procurve-2520-8-poe.front.png differ
diff --git a/elevation-images/HPE/hpe-procurve-2520g-24-poe.front.png b/elevation-images/HPE/hpe-procurve-2520g-24-poe.front.png
new file mode 100644
index 000000000..222bcce2f
Binary files /dev/null and b/elevation-images/HPE/hpe-procurve-2520g-24-poe.front.png differ
diff --git a/elevation-images/HPE/hpe-procurve-2520g-8-poe.front.png b/elevation-images/HPE/hpe-procurve-2520g-8-poe.front.png
new file mode 100644
index 000000000..6b5991112
Binary files /dev/null and b/elevation-images/HPE/hpe-procurve-2520g-8-poe.front.png differ
diff --git a/elevation-images/HPE/hpe-procurve-2810-24g.front.png b/elevation-images/HPE/hpe-procurve-2810-24g.front.png
new file mode 100644
index 000000000..8ec9567b3
Binary files /dev/null and b/elevation-images/HPE/hpe-procurve-2810-24g.front.png differ
diff --git a/elevation-images/HPE/hpe-procurve-2810-48g.front.png b/elevation-images/HPE/hpe-procurve-2810-48g.front.png
new file mode 100644
index 000000000..9f7c7ed76
Binary files /dev/null and b/elevation-images/HPE/hpe-procurve-2810-48g.front.png differ
diff --git a/elevation-images/HPE/hpe-procurve-5406zl.front.png b/elevation-images/HPE/hpe-procurve-5406zl.front.png
new file mode 100644
index 000000000..826a8ebf5
Binary files /dev/null and b/elevation-images/HPE/hpe-procurve-5406zl.front.png differ
diff --git a/elevation-images/HPE/hpe-procurve-5406zl.rear.png b/elevation-images/HPE/hpe-procurve-5406zl.rear.png
new file mode 100644
index 000000000..bac6fa1f0
Binary files /dev/null and b/elevation-images/HPE/hpe-procurve-5406zl.rear.png differ
diff --git a/elevation-images/HPE/hpe-procurve-5412zl.front.png b/elevation-images/HPE/hpe-procurve-5412zl.front.png
new file mode 100644
index 000000000..68425fda2
Binary files /dev/null and b/elevation-images/HPE/hpe-procurve-5412zl.front.png differ
diff --git a/elevation-images/HPE/hpe-procurve-5412zl.rear.png b/elevation-images/HPE/hpe-procurve-5412zl.rear.png
new file mode 100644
index 000000000..d570c87d9
Binary files /dev/null and b/elevation-images/HPE/hpe-procurve-5412zl.rear.png differ