diff --git a/device-types/Fortinet/FG-3700D.yaml b/device-types/Fortinet/FG-3700D.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..746e35189c387ef40b0b54498efd21a70d2fdb06
--- /dev/null
+++ b/device-types/Fortinet/FG-3700D.yaml
@@ -0,0 +1,93 @@
+---
+manufacturer: Fortinet
+model: FortiGate 3700D
+slug: fortinet-fg-3700d
+part_number: FG-3700D
+u_height: 3
+weight: 21.3
+weight_unit: kg
+airflow: front-to-rear
+is_full_depth: false
+front_image: true
+comments: '[FortiGate 3700D Series Datasheet](https://www.fortinet.com/content/dam/fortinet/assets/data-sheets/FortiGate_3700D.pdf)'
+console-ports:
+  - name: Console
+    type: rj-45
+  - name: USB MGMT
+    type: usb-mini-b
+module-bays:
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'
+interfaces:
+  - name: mgmt1
+    type: 1000base-t
+    mgmt_only: true
+  - name: mgmt2
+    type: 1000base-t
+    mgmt_only: true
+  - name: port1
+    type: 40gbase-x-qsfpp
+  - name: port2
+    type: 40gbase-x-qsfpp
+  - name: port3
+    type: 40gbase-x-qsfpp
+  - name: port4
+    type: 40gbase-x-qsfpp
+  - name: port5
+    type: 10gbase-x-sfpp
+  - name: port6
+    type: 10gbase-x-sfpp
+  - name: port7
+    type: 10gbase-x-sfpp
+  - name: port8
+    type: 10gbase-x-sfpp
+  - name: port9
+    type: 10gbase-x-sfpp
+  - name: port10
+    type: 10gbase-x-sfpp
+  - name: port11
+    type: 10gbase-x-sfpp
+  - name: port12
+    type: 10gbase-x-sfpp
+  - name: port13
+    type: 10gbase-x-sfpp
+  - name: port14
+    type: 10gbase-x-sfpp
+  - name: port15
+    type: 10gbase-x-sfpp
+  - name: port16
+    type: 10gbase-x-sfpp
+  - name: port17
+    type: 10gbase-x-sfpp
+  - name: port18
+    type: 10gbase-x-sfpp
+  - name: port19
+    type: 10gbase-x-sfpp
+  - name: port20
+    type: 10gbase-x-sfpp
+  - name: port21
+    type: 10gbase-x-sfpp
+  - name: port22
+    type: 10gbase-x-sfpp
+  - name: port23
+    type: 10gbase-x-sfpp
+  - name: port24
+    type: 10gbase-x-sfpp
+  - name: port25
+    type: 10gbase-x-sfpp
+  - name: port26
+    type: 10gbase-x-sfpp
+  - name: port27
+    type: 10gbase-x-sfpp
+  - name: port28
+    type: 10gbase-x-sfpp
+  - name: port29
+    type: 10gbase-x-sfpp
+  - name: port30
+    type: 10gbase-x-sfpp
+  - name: port31
+    type: 10gbase-x-sfpp
+  - name: port32
+    type: 10gbase-x-sfpp
diff --git a/device-types/Fortinet/FG-800D.yaml b/device-types/Fortinet/FG-800D.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..c668862c267615936d55ba789073c8976d01c851
--- /dev/null
+++ b/device-types/Fortinet/FG-800D.yaml
@@ -0,0 +1,92 @@
+---
+manufacturer: Fortinet
+model: FortiGate 800D
+slug: fortinet-fg-800d
+part_number: FG-800D
+u_height: 1
+weight: 8.6
+weight_unit: kg
+airflow: front-to-rear
+is_full_depth: false
+front_image: true
+rear_image: true
+comments: '[FortiGate 800D Series Datasheet](https://www.fortinet.com/content/dam/fortinet/assets/data-sheets/FortiGate_800D.pdf)'
+console-ports:
+  - name: Console
+    type: rj-45
+module-bays:
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'
+interfaces:
+  - name: mgmt1
+    type: 1000base-t
+    mgmt_only: true
+  - name: mgmt2
+    type: 1000base-t
+    mgmt_only: true
+  - name: wan1/1
+    type: 1000base-t
+  - name: wan2/2
+    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: 1000base-t
+  - name: port14
+    type: 1000base-t
+  - name: port15
+    type: 1000base-t
+  - name: port16
+    type: 1000base-t
+  - name: port17
+    type: 1000base-t
+  - name: port18
+    type: 1000base-t
+  - name: port19
+    type: 1000base-t
+  - name: port20
+    type: 1000base-t
+  - name: port21
+    type: 1000base-t
+  - name: port22
+    type: 1000base-t
+  - name: port23
+    type: 1000base-x-sfp
+  - name: port24
+    type: 1000base-x-sfp
+  - name: port25
+    type: 1000base-x-sfp
+  - name: port26
+    type: 1000base-x-sfp
+  - name: port27
+    type: 1000base-x-sfp
+  - name: port28
+    type: 1000base-x-sfp
+  - name: port29
+    type: 1000base-x-sfp
+  - name: port30
+    type: 1000base-x-sfp
+  - name: port31
+    type: 10gbase-x-sfpp
+  - name: port32
+    type: 10gbase-x-sfpp
diff --git a/elevation-images/Fortinet/fortinet-fg-3700d.front.png b/elevation-images/Fortinet/fortinet-fg-3700d.front.png
new file mode 100644
index 0000000000000000000000000000000000000000..489de9b6e7ec1a63a5ec0c611a79332a06d0ee13
Binary files /dev/null and b/elevation-images/Fortinet/fortinet-fg-3700d.front.png differ
diff --git a/elevation-images/Fortinet/fortinet-fg-800d.front.png b/elevation-images/Fortinet/fortinet-fg-800d.front.png
new file mode 100644
index 0000000000000000000000000000000000000000..59bfd0f0c45b039486c3ebf6ac72e0268c00c539
Binary files /dev/null and b/elevation-images/Fortinet/fortinet-fg-800d.front.png differ
diff --git a/elevation-images/Fortinet/fortinet-fg-800d.rear.png b/elevation-images/Fortinet/fortinet-fg-800d.rear.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7d14e4f9d569cc6580444a8cb4fee8b239f05ca
Binary files /dev/null and b/elevation-images/Fortinet/fortinet-fg-800d.rear.png differ
diff --git a/module-types/Fortinet/SP-FG3800D-PS.yaml b/module-types/Fortinet/SP-FG3800D-PS.yaml
index fbc5ccdaaeae5530146823e29d271ed392416106..c4d362d72fc349027ca0bd7c67e76f58e6d0ffc0 100644
--- a/module-types/Fortinet/SP-FG3800D-PS.yaml
+++ b/module-types/Fortinet/SP-FG3800D-PS.yaml
@@ -5,5 +5,7 @@ part_number: SP-FG3800D-PS
 power-ports:
   - name: PSU{module}
     type: iec-60320-c14
+    maximum_draw: 840
+    allocated_draw: 300
 weight: 1.4
 weight_unit: lb
diff --git a/module-types/Fortinet/SP-FG600C-PS.yaml b/module-types/Fortinet/SP-FG600C-PS.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..8577af7c49f8082a167ae45384ac63ce85cd75d2
--- /dev/null
+++ b/module-types/Fortinet/SP-FG600C-PS.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: Fortinet
+model: SP-FG600C-PS
+part_number: SP-FG600C-PS
+power-ports:
+  - name: PSU{module}
+    type: iec-60320-c14
+    maximum_draw: 187
+    allocated_draw: 128