diff --git a/device-types/Fortinet/FG-400F.yaml b/device-types/Fortinet/FG-400F.yaml
index cbdccebb3..2a4a8b818 100644
--- a/device-types/Fortinet/FG-400F.yaml
+++ b/device-types/Fortinet/FG-400F.yaml
@@ -57,35 +57,35 @@ interfaces:
     type: 1000base-t
   - name: port16
     type: 1000base-t
+  - name: x1
+    type: 10gbase-x-sfpp
+  - name: x2
+    type: 10gbase-x-sfpp
+  - name: x3
+    type: 10gbase-x-sfpp
+  - name: x4
+    type: 10gbase-x-sfpp
+  - name: x5
+    type: 10gbase-x-sfpp
+  - name: x6
+    type: 10gbase-x-sfpp
+  - name: x7
+    type: 10gbase-x-sfpp
+  - name: x8
+    type: 10gbase-x-sfpp
   - name: port17
-    type: 10gbase-x-sfpp
+    type: 1000base-x-sfp
   - name: port18
-    type: 10gbase-x-sfpp
+    type: 1000base-x-sfp
   - name: port19
-    type: 10gbase-x-sfpp
+    type: 1000base-x-sfp
   - name: port20
-    type: 10gbase-x-sfpp
+    type: 1000base-x-sfp
   - name: port21
-    type: 10gbase-x-sfpp
+    type: 1000base-x-sfp
   - name: port22
-    type: 10gbase-x-sfpp
+    type: 1000base-x-sfp
   - name: port23
-    type: 10gbase-x-sfpp
+    type: 1000base-x-sfp
   - name: port24
-    type: 10gbase-x-sfpp
-  - 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: 1000base-x-sfp
-  - name: port32
     type: 1000base-x-sfp