diff --git a/device-types/Fortinet/FS-T1024E.yaml b/device-types/Fortinet/FS-T1024E.yaml
new file mode 100644
index 000000000..309661a2a
--- /dev/null
+++ b/device-types/Fortinet/FS-T1024E.yaml
@@ -0,0 +1,75 @@
+---
+manufacturer: Fortinet
+model: FortiSwitch T1024E
+slug: fortinet-fs-t1024e
+part_number: FS-T1024E
+u_height: 1
+weight: 6.5
+weight_unit: kg
+is_full_depth: false
+comments: '[Datasheet](https://www.fortinet.com/content/dam/fortinet/assets/data-sheets/FortiSwitch_Data_Center_Series.pdf)  [Quickstart](https://fortinetweb.s3.amazonaws.com/docs.fortinet.com/v2/attachments/002ca2c6-586f-11ec-bdf2-fa163e15d75b/FortiSwitch-1024E-Series-QSG.pdf)'
+airflow: front-to-rear
+console-ports:
+  - name: Console
+    type: rj-45
+module-bays:
+  - name: PSU1
+    position: '1'
+  - name: PSU2
+    position: '2'
+interfaces:
+  - name: port1
+    type: 10gbase-t
+  - name: port2
+    type: 10gbase-t
+  - name: port3
+    type: 10gbase-t
+  - name: port4
+    type: 10gbase-t
+  - name: port5
+    type: 10gbase-t
+  - name: port6
+    type: 10gbase-t
+  - name: port7
+    type: 10gbase-t
+  - name: port8
+    type: 10gbase-t
+  - name: port9
+    type: 10gbase-t
+  - name: port10
+    type: 10gbase-t
+  - name: port11
+    type: 10gbase-t
+  - name: port12
+    type: 10gbase-t
+  - name: port13
+    type: 10gbase-t
+  - name: port14
+    type: 10gbase-t
+  - name: port15
+    type: 10gbase-t
+  - name: port16
+    type: 10gbase-t
+  - name: port17
+    type: 10gbase-t
+  - name: port18
+    type: 10gbase-t
+  - name: port19
+    type: 10gbase-t
+  - name: port20
+    type: 10gbase-t
+  - name: port21
+    type: 10gbase-t
+  - name: port22
+    type: 10gbase-t
+  - name: port23
+    type: 10gbase-t
+  - name: port24
+    type: 10gbase-t
+  - name: port25
+    type: 100gbase-x-qsfp28
+  - name: port26
+    type: 100gbase-x-qsfp28
+  - name: mgmt
+    type: 1000base-t
+    mgmt_only: true
diff --git a/module-types/Fortinet/FS-PSU-300.yaml b/module-types/Fortinet/FS-PSU-300.yaml
new file mode 100644
index 000000000..97525e09a
--- /dev/null
+++ b/module-types/Fortinet/FS-PSU-300.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: Fortinet
+model: FS-PSU-300
+part_number: FS-PSU-300
+power-ports:
+  - name: PSU{module}
+    type: iec-60320-c14
+weight: 0.8
+weight_unit: kg