diff --git a/device-types/Fortinet/FG-3300E.yaml b/device-types/Fortinet/FG-3300E.yaml
new file mode 100644
index 000000000..931715209
--- /dev/null
+++ b/device-types/Fortinet/FG-3300E.yaml
@@ -0,0 +1,94 @@
+---
+manufacturer: Fortinet
+model: FortiGate 3300E
+slug: fortinet-fg-3300e
+part_number: FG-3300E
+u_height: 2
+is_full_depth: true
+weight: 19.5
+weight_unit: kg
+airflow: front-to-rear
+comments: '[Fortinet FortiGate 3300E Data Sheet](https://www.fortinet.com/content/dam/fortinet/assets/data-sheets/fortigate-3300e-series.pdf)'
+console-ports:
+  - name: Console
+    type: rj-45
+interfaces:
+  - name: mgmt1
+    type: 1000base-t
+    mgmt_only: true
+  - name: mgmt2
+    type: 1000base-t
+    mgmt_only: true
+  - name: ha1
+    type: 1000base-t
+  - name: ha2
+    type: 1000base-t
+  - name: port1
+    type: 1000base-t
+  - name: port2
+    type: 1000base-t
+  - name: port3
+    type: 1000base-t
+  - name: port4
+    type: 1000base-t
+  - name: port5
+    type: 1000base-t
+  - name: port6
+    type: 1000base-t
+  - name: port7
+    type: 1000base-t
+  - name: port8
+    type: 1000base-t
+  - name: port9
+    type: 1000base-t
+  - name: port10
+    type: 1000base-t
+  - name: port11
+    type: 1000base-t
+  - name: port12
+    type: 1000base-t
+  - name: port13
+    type: 25gbase-x-sfp28
+  - name: port14
+    type: 25gbase-x-sfp28
+  - name: port15
+    type: 25gbase-x-sfp28
+  - name: port16
+    type: 25gbase-x-sfp28
+  - name: port21
+    type: 25gbase-x-sfp28
+  - name: port22
+    type: 25gbase-x-sfp28
+  - name: port23
+    type: 25gbase-x-sfp28
+  - name: port24
+    type: 25gbase-x-sfp28
+  - name: port25
+    type: 25gbase-x-sfp28
+  - name: port26
+    type: 25gbase-x-sfp28
+  - name: port27
+    type: 25gbase-x-sfp28
+  - name: port28
+    type: 25gbase-x-sfp28
+  - name: port29
+    type: 25gbase-x-sfp28
+  - name: port30
+    type: 25gbase-x-sfp28
+  - name: port31
+    type: 25gbase-x-sfp28
+  - name: port32
+    type: 25gbase-x-sfp28
+  - name: port33
+    type: 100gbase-x-qsfp28
+  - name: port34
+    type: 100gbase-x-qsfp28
+  - name: port35
+    type: 100gbase-x-qsfp28
+  - name: port36
+    type: 100gbase-x-qsfp28
+module-bays:
+  - name: PSU1
+    position: '1'
+  - name: PSU2
+    position: '2'
diff --git a/device-types/Fortinet/FG-3301E.yaml b/device-types/Fortinet/FG-3301E.yaml
new file mode 100644
index 000000000..72189ccc7
--- /dev/null
+++ b/device-types/Fortinet/FG-3301E.yaml
@@ -0,0 +1,94 @@
+---
+manufacturer: Fortinet
+model: FortiGate 3301E
+slug: fortinet-fg-3301e
+part_number: FG-3301E
+u_height: 2
+is_full_depth: true
+weight: 20.1
+weight_unit: kg
+airflow: front-to-rear
+comments: '[Fortinet FortiGate 3301E Data Sheet](https://www.fortinet.com/content/dam/fortinet/assets/data-sheets/fortigate-3300e-series.pdf)'
+console-ports:
+  - name: Console
+    type: rj-45
+interfaces:
+  - name: mgmt1
+    type: 1000base-t
+    mgmt_only: true
+  - name: mgmt2
+    type: 1000base-t
+    mgmt_only: true
+  - name: ha1
+    type: 1000base-t
+  - name: ha2
+    type: 1000base-t
+  - name: port1
+    type: 1000base-t
+  - name: port2
+    type: 1000base-t
+  - name: port3
+    type: 1000base-t
+  - name: port4
+    type: 1000base-t
+  - name: port5
+    type: 1000base-t
+  - name: port6
+    type: 1000base-t
+  - name: port7
+    type: 1000base-t
+  - name: port8
+    type: 1000base-t
+  - name: port9
+    type: 1000base-t
+  - name: port10
+    type: 1000base-t
+  - name: port11
+    type: 1000base-t
+  - name: port12
+    type: 1000base-t
+  - name: port13
+    type: 25gbase-x-sfp28
+  - name: port14
+    type: 25gbase-x-sfp28
+  - name: port15
+    type: 25gbase-x-sfp28
+  - name: port16
+    type: 25gbase-x-sfp28
+  - name: port21
+    type: 25gbase-x-sfp28
+  - name: port22
+    type: 25gbase-x-sfp28
+  - name: port23
+    type: 25gbase-x-sfp28
+  - name: port24
+    type: 25gbase-x-sfp28
+  - name: port25
+    type: 25gbase-x-sfp28
+  - name: port26
+    type: 25gbase-x-sfp28
+  - name: port27
+    type: 25gbase-x-sfp28
+  - name: port28
+    type: 25gbase-x-sfp28
+  - name: port29
+    type: 25gbase-x-sfp28
+  - name: port30
+    type: 25gbase-x-sfp28
+  - name: port31
+    type: 25gbase-x-sfp28
+  - name: port32
+    type: 25gbase-x-sfp28
+  - name: port33
+    type: 100gbase-x-qsfp28
+  - name: port34
+    type: 100gbase-x-qsfp28
+  - name: port35
+    type: 100gbase-x-qsfp28
+  - name: port36
+    type: 100gbase-x-qsfp28
+module-bays:
+  - name: PSU1
+    position: '1'
+  - name: PSU2
+    position: '2'
diff --git a/device-types/Fortinet/SP-RACKTRAY-02.yaml b/device-types/Fortinet/SP-RACKTRAY-02.yaml
new file mode 100644
index 000000000..dd2cfffef
--- /dev/null
+++ b/device-types/Fortinet/SP-RACKTRAY-02.yaml
@@ -0,0 +1,12 @@
+---
+manufacturer: Fortinet
+model: SP-RACKTRAY-02
+slug: fortinet-sp-racktray-02
+part_number: SP-RACKTRAY-02
+u_height: 1.0
+is_full_depth: false
+subdevice_role: parent
+comments: '[Fortinet Rack Mount Tray QuickStart Guide](https://fortinetweb.s3.amazonaws.com/docs.fortinet.com/v2/attachments/d3b3c280-1a08-11e9-9685-f8bc1258b856/Fortinet-Rack-Mount-Tray-QSG.pdf)'
+device-bays:
+  - name: Left
+  - name: Right