diff --git a/device-types/Juniper/SRX300.yaml b/device-types/Juniper/SRX300.yaml
index 6595d3dd3..be5242806 100644
--- a/device-types/Juniper/SRX300.yaml
+++ b/device-types/Juniper/SRX300.yaml
@@ -2,12 +2,20 @@
 manufacturer: Juniper
 model: SRX300
 slug: juniper-srx300
+part_number: SRX300-SYS-JB
 u_height: 1
+weight: 4.38
+weight_unit: lb
+airflow: passive
 is_full_depth: false
-comments: '[Juniper SRX300 Data Sheet](https://www.juniper.net/content/dam/www/assets/datasheets/us/en/security/srx300-line-services-gateways-branch-datasheet.pdf)'
+comments: '[Juniper SRX300 Series Data Sheet](https://www.juniper.net/content/dam/www/assets/datasheets/us/en/security/srx300-line-services-gateways-branch-datasheet.pdf)'
 console-ports:
   - name: Console
     type: rj-45
+power-ports:
+  - name: PSU0
+    type: iec-60320-c14
+    allocated_draw: 25
 interfaces:
   - name: ge-0/0/0
     type: 1000base-t
@@ -25,7 +33,3 @@ interfaces:
     type: 1000base-x-sfp
   - name: ge-0/0/7
     type: 1000base-x-sfp
-power-ports:
-  - name: PSU0
-    type: iec-60320-c14
-    allocated_draw: 25
diff --git a/device-types/Juniper/SRX320-POE.yaml b/device-types/Juniper/SRX320-POE.yaml
new file mode 100644
index 000000000..6a905b45a
--- /dev/null
+++ b/device-types/Juniper/SRX320-POE.yaml
@@ -0,0 +1,47 @@
+---
+manufacturer: Juniper
+model: SRX320-POE
+slug: juniper-srx320-poe
+part_number: SRX320-SYS-JB-P
+u_height: 1
+weight: 3.28
+weight_unit: lb
+airflow: front-to-rear
+is_full_depth: false
+comments: '[Juniper SRX300 Series Data Sheet](https://www.juniper.net/content/dam/www/assets/datasheets/us/en/security/srx300-line-services-gateways-branch-datasheet.pdf)'
+console-ports:
+  - name: Console
+    type: rj-45
+power-ports:
+  - name: PSU0
+    type: iec-60320-c14
+    allocated_draw: 46
+interfaces:
+  - name: ge-0/0/0
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: ge-0/0/1
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: ge-0/0/2
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: ge-0/0/3
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: ge-0/0/4
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: ge-0/0/5
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: ge-0/0/6
+    type: 1000base-x-sfp
+  - name: ge-0/0/7
+    type: 1000base-x-sfp
diff --git a/device-types/Juniper/SRX320.yaml b/device-types/Juniper/SRX320.yaml
index a4d536e14..ead9b70d6 100644
--- a/device-types/Juniper/SRX320.yaml
+++ b/device-types/Juniper/SRX320.yaml
@@ -2,12 +2,20 @@
 manufacturer: Juniper
 model: SRX320
 slug: juniper-srx320
+part_number: SRX320-SYS-JB
 u_height: 1
+weight: 3.28
+weight_unit: lb
+airflow: front-to-rear
 is_full_depth: false
-comments: '[Juniper SRX320 Data Sheet](https://www.juniper.net/content/dam/www/assets/datasheets/us/en/security/srx300-line-services-gateways-branch-datasheet.pdf)'
+comments: '[Juniper SRX300 Series Data Sheet](https://www.juniper.net/content/dam/www/assets/datasheets/us/en/security/srx300-line-services-gateways-branch-datasheet.pdf)'
 console-ports:
   - name: Console
     type: rj-45
+power-ports:
+  - name: PSU0
+    type: iec-60320-c14
+    allocated_draw: 46
 interfaces:
   - name: ge-0/0/0
     type: 1000base-t
@@ -25,7 +33,3 @@ interfaces:
     type: 1000base-x-sfp
   - name: ge-0/0/7
     type: 1000base-x-sfp
-power-ports:
-  - name: PSU0
-    type: iec-60320-c14
-    allocated_draw: 46
diff --git a/device-types/Juniper/SRX340.yaml b/device-types/Juniper/SRX340.yaml
index d09de4fdd..e8f3e27e0 100644
--- a/device-types/Juniper/SRX340.yaml
+++ b/device-types/Juniper/SRX340.yaml
@@ -2,13 +2,34 @@
 manufacturer: Juniper
 model: SRX340
 slug: juniper-srx340
+part_number: SRX340-SYS-JB
 u_height: 1
+weight: 10.80
+weight_unit: lb
+airflow: front-to-rear
 is_full_depth: false
-comments: '[Juniper SRX340 Data Sheet](https://www.juniper.net/content/dam/www/assets/datasheets/us/en/security/srx300-line-services-gateways-branch-datasheet.pdf)'
+comments: '[Juniper SRX300 Series Data Sheet](https://www.juniper.net/content/dam/www/assets/datasheets/us/en/security/srx300-line-services-gateways-branch-datasheet.pdf)'
 console-ports:
   - name: Console
     type: rj-45
+power-ports:
+  - name: PSU0
+    type: iec-60320-c14
+    maximum_draw: 122
+    allocated_draw: 122
+module-bays:
+  - name: PIM 0
+    position: '0'
+  - name: PIM 1
+    position: '1'
+  - name: PIM 2
+    position: '2'
+  - name: PIM 3
+    position: '3'
 interfaces:
+  - name: fxp0
+    type: 1000base-t
+    mgmt_only: true
   - name: ge-0/0/0
     type: 1000base-t
   - name: ge-0/0/1
@@ -41,10 +62,3 @@ interfaces:
     type: 1000base-x-sfp
   - name: ge-0/0/15
     type: 1000base-x-sfp
-  - name: me0
-    type: 1000base-t
-power-ports:
-  - name: PSU0
-    type: iec-60320-c14
-    maximum_draw: 122
-    allocated_draw: 122
diff --git a/device-types/Juniper/SRX345-DC.yaml b/device-types/Juniper/SRX345-DC.yaml
new file mode 100644
index 000000000..0e4d1ddec
--- /dev/null
+++ b/device-types/Juniper/SRX345-DC.yaml
@@ -0,0 +1,63 @@
+---
+manufacturer: Juniper
+model: SRX345-DC
+slug: juniper-srx345-dc
+part_number: SRX345-SYS-JB-DC
+u_height: 1
+weight: 10.80
+weight_unit: lb
+airflow: front-to-rear
+is_full_depth: false
+comments: '[Juniper SRX300 Series Data Sheet](https://www.juniper.net/content/dam/www/assets/datasheets/us/en/security/srx300-line-services-gateways-branch-datasheet.pdf)'
+console-ports:
+  - name: Console
+    type: rj-45
+power-ports:
+  - name: PSU0
+    type: dc-terminal
+    allocated_draw: 122
+module-bays:
+  - name: PIM 0
+    position: '0'
+  - name: PIM 1
+    position: '1'
+  - name: PIM 2
+    position: '2'
+  - name: PIM 3
+    position: '3'
+interfaces:
+  - name: fxp0
+    type: 1000base-t
+    mgmt_only: true
+  - name: ge-0/0/0
+    type: 1000base-t
+  - name: ge-0/0/1
+    type: 1000base-t
+  - name: ge-0/0/2
+    type: 1000base-t
+  - name: ge-0/0/3
+    type: 1000base-t
+  - name: ge-0/0/4
+    type: 1000base-t
+  - name: ge-0/0/5
+    type: 1000base-t
+  - name: ge-0/0/6
+    type: 1000base-t
+  - name: ge-0/0/7
+    type: 1000base-t
+  - name: ge-0/0/8
+    type: 1000base-x-sfp
+  - name: ge-0/0/9
+    type: 1000base-x-sfp
+  - name: ge-0/0/10
+    type: 1000base-x-sfp
+  - name: ge-0/0/11
+    type: 1000base-x-sfp
+  - name: ge-0/0/12
+    type: 1000base-x-sfp
+  - name: ge-0/0/13
+    type: 1000base-x-sfp
+  - name: ge-0/0/14
+    type: 1000base-x-sfp
+  - name: ge-0/0/15
+    type: 1000base-x-sfp
diff --git a/device-types/Juniper/SRX345-DUAL-AC.yaml b/device-types/Juniper/SRX345-DUAL-AC.yaml
new file mode 100644
index 000000000..2cfdcfdd1
--- /dev/null
+++ b/device-types/Juniper/SRX345-DUAL-AC.yaml
@@ -0,0 +1,66 @@
+---
+manufacturer: Juniper
+model: SRX345-DUAL-AC
+slug: juniper-srx345-dual-ac
+part_number: SRX345-SYS-JB-2AC
+u_height: 1
+weight: 11.02
+weight_unit: lb
+airflow: front-to-rear
+is_full_depth: false
+comments: '[Juniper SRX300 Series Data Sheet](https://www.juniper.net/content/dam/www/assets/datasheets/us/en/security/srx300-line-services-gateways-branch-datasheet.pdf)'
+console-ports:
+  - name: Console
+    type: rj-45
+power-ports:
+  - name: PSU0
+    type: iec-60320-c14
+    allocated_draw: 122
+  - name: PSU1
+    type: iec-60320-c14
+    allocated_draw: 122
+module-bays:
+  - name: PIM 0
+    position: '0'
+  - name: PIM 1
+    position: '1'
+  - name: PIM 2
+    position: '2'
+  - name: PIM 3
+    position: '3'
+interfaces:
+  - name: fxp0
+    type: 1000base-t
+    mgmt_only: true
+  - name: ge-0/0/0
+    type: 1000base-t
+  - name: ge-0/0/1
+    type: 1000base-t
+  - name: ge-0/0/2
+    type: 1000base-t
+  - name: ge-0/0/3
+    type: 1000base-t
+  - name: ge-0/0/4
+    type: 1000base-t
+  - name: ge-0/0/5
+    type: 1000base-t
+  - name: ge-0/0/6
+    type: 1000base-t
+  - name: ge-0/0/7
+    type: 1000base-t
+  - name: ge-0/0/8
+    type: 1000base-x-sfp
+  - name: ge-0/0/9
+    type: 1000base-x-sfp
+  - name: ge-0/0/10
+    type: 1000base-x-sfp
+  - name: ge-0/0/11
+    type: 1000base-x-sfp
+  - name: ge-0/0/12
+    type: 1000base-x-sfp
+  - name: ge-0/0/13
+    type: 1000base-x-sfp
+  - name: ge-0/0/14
+    type: 1000base-x-sfp
+  - name: ge-0/0/15
+    type: 1000base-x-sfp
diff --git a/device-types/Juniper/SRX345.yaml b/device-types/Juniper/SRX345.yaml
index a46671fcd..ddce60960 100644
--- a/device-types/Juniper/SRX345.yaml
+++ b/device-types/Juniper/SRX345.yaml
@@ -2,12 +2,29 @@
 manufacturer: Juniper
 model: SRX345
 slug: juniper-srx345
+part_number: SRX345-SYS-JB
 u_height: 1
+weight: 10.80
+weight_unit: lb
+airflow: front-to-rear
 is_full_depth: false
-comments: '[Juniper SRX345 Data Sheet](https://www.juniper.net/content/dam/www/assets/datasheets/us/en/security/srx300-line-services-gateways-branch-datasheet.pdf)'
+comments: '[Juniper SRX300 Series Data Sheet](https://www.juniper.net/content/dam/www/assets/datasheets/us/en/security/srx300-line-services-gateways-branch-datasheet.pdf)'
 console-ports:
   - name: Console
     type: rj-45
+power-ports:
+  - name: PSU0
+    type: iec-60320-c14
+    allocated_draw: 122
+module-bays:
+  - name: PIM 0
+    position: '0'
+  - name: PIM 1
+    position: '1'
+  - name: PIM 2
+    position: '2'
+  - name: PIM 3
+    position: '3'
 interfaces:
   - name: fxp0
     type: 1000base-t
@@ -44,7 +61,3 @@ interfaces:
     type: 1000base-x-sfp
   - name: ge-0/0/15
     type: 1000base-x-sfp
-power-ports:
-  - name: PSU0
-    type: iec-60320-c14
-    allocated_draw: 122
diff --git a/device-types/Juniper/SRX380-P.yaml b/device-types/Juniper/SRX380-P.yaml
deleted file mode 100644
index 401c5c12a..000000000
--- a/device-types/Juniper/SRX380-P.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-manufacturer: Juniper
-model: JNP-SRX380-P
-slug: juniper-jnp-srx380-p
-part_number: SRX380-P
-u_height: 1
-is_full_depth: true
-console-ports:
-  - name: console0
-    type: rj-45
-power-ports:
-  - name: power0
-    type: iec-60320-c14
-interfaces:
-  - name: ge-0/0/0
-    type: 1000base-t
-  - name: ge-0/0/1
-    type: 1000base-t
-  - name: ge-0/0/2
-    type: 1000base-t
-  - name: ge-0/0/3
-    type: 1000base-t
-  - name: ge-0/0/4
-    type: 1000base-t
-  - name: ge-0/0/5
-    type: 1000base-t
-  - name: ge-0/0/6
-    type: 1000base-t
-  - name: ge-0/0/7
-    type: 1000base-t
-  - name: ge-0/0/8
-    type: 1000base-t
-  - name: ge-0/0/9
-    type: 1000base-t
-  - name: ge-0/0/10
-    type: 1000base-t
-  - name: ge-0/0/11
-    type: 1000base-t
-  - name: ge-0/0/12
-    type: 1000base-t
-  - name: ge-0/0/13
-    type: 1000base-t
-  - name: ge-0/0/14
-    type: 1000base-t
-  - name: ge-0/0/15
-    type: 1000base-t
-  - name: xe-0/0/16
-    type: 10gbase-x-sfpp
-  - name: xe-0/0/17
-    type: 10gbase-x-sfpp
-  - name: xe-0/0/18
-    type: 10gbase-x-sfpp
-  - name: xe-0/0/19
-    type: 10gbase-x-sfpp
-  - name: fxp0
-    type: 1000base-t
-    mgmt_only: true
diff --git a/device-types/Juniper/SRX380.yaml b/device-types/Juniper/SRX380.yaml
new file mode 100644
index 000000000..34c2fc9ed
--- /dev/null
+++ b/device-types/Juniper/SRX380.yaml
@@ -0,0 +1,103 @@
+---
+manufacturer: Juniper
+model: SRX380
+slug: juniper-srx380
+part_number: SRX380-P-SYS-JB-AC
+u_height: 1
+weight: 16.76
+weight_unit: lb
+airflow: front-to-rear
+is_full_depth: false
+comments: '[Juniper SRX300 Series Data Sheet](https://www.juniper.net/content/dam/www/assets/datasheets/us/en/security/srx300-line-services-gateways-branch-datasheet.pdf)'
+console-ports:
+  - name: console0
+    type: rj-45
+module-bays:
+  - name: PSU 0
+    position: '0'
+  - name: PSU 1
+    position: '1'
+  - name: PIM 0
+    position: '2'
+  - name: PIM 1
+    position: '3'
+  - name: PIM 2
+    position: '4'
+  - name: PIM 3
+    position: '5'
+interfaces:
+  - name: fxp0
+    type: 1000base-t
+    mgmt_only: true
+  - name: ge-0/0/0
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: ge-0/0/1
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: ge-0/0/2
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: ge-0/0/3
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: ge-0/0/4
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: ge-0/0/5
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: ge-0/0/6
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: ge-0/0/7
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: ge-0/0/8
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: ge-0/0/9
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: ge-0/0/10
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: ge-0/0/11
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: ge-0/0/12
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: ge-0/0/13
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: ge-0/0/14
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: ge-0/0/15
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: xe-0/0/16
+    type: 10gbase-x-sfpp
+  - name: xe-0/0/17
+    type: 10gbase-x-sfpp
+  - name: xe-0/0/18
+    type: 10gbase-x-sfpp
+  - name: xe-0/0/19
+    type: 10gbase-x-sfpp