diff --git a/device-types/Cisco/C9800-L-C.yaml b/device-types/Cisco/C9800-L-C.yaml
index 13cb32882..b7bea56ca 100644
--- a/device-types/Cisco/C9800-L-C.yaml
+++ b/device-types/Cisco/C9800-L-C.yaml
@@ -3,8 +3,12 @@ manufacturer: Cisco
 model: Catalyst 9800-L-C
 slug: cisco-c9800-l-c
 part_number: C9800-L-C
-u_height: 1
+u_height: 0
+subdevice_role: child
 is_full_depth: false
+airflow: front-to-rear
+weight: 3.95
+weight_unit: lb
 console-ports:
   - name: Con
     type: rj-45
@@ -17,19 +21,19 @@ interfaces:
   - name: Redundancy Port
     type: 1000base-t
     mgmt_only: true
-  - name: TenGigabitEthernet1
+  - name: TwoGigabitEthernet0/0/0
+    type: 2.5gbase-t
+  - name: TwoGigabitEthernet0/0/1
+    type: 2.5gbase-t
+  - name: TwoGigabitEthernet0/0/2
+    type: 2.5gbase-t
+  - name: TwoGigabitEthernet0/0/3
+    type: 2.5gbase-t
+  - name: TenGigabitEthernet0/1/0
     type: 10gbase-t
-  - name: TenGigabitEthernet2
+  - name: TenGigabitEthernet0/1/1
     type: 10gbase-t
-  - name: GigabitEthernet1
-    type: 2.5gbase-t
-  - name: GigabitEthernet2
-    type: 2.5gbase-t
-  - name: GigabitEthernet3
-    type: 2.5gbase-t
-  - name: GigabitEthernet4
-    type: 2.5gbase-t
 power-ports:
   - name: PS1
-    type: iec-60320-c14
-    maximum_draw: 110
+    type: dc-terminal
+    maximum_draw: 87
diff --git a/device-types/Cisco/C9800-L-F.yaml b/device-types/Cisco/C9800-L-F.yaml
new file mode 100644
index 000000000..f649e15cb
--- /dev/null
+++ b/device-types/Cisco/C9800-L-F.yaml
@@ -0,0 +1,39 @@
+---
+manufacturer: Cisco
+model: Catalyst 9800-L-F
+slug: cisco-c9800-l-f
+part_number: C9800-L-F
+u_height: 0
+subdevice_role: child
+is_full_depth: false
+airflow: front-to-rear
+weight: 4.01
+weight_unit: lb
+console-ports:
+  - name: Con
+    type: rj-45
+  - name: usb0
+    type: usb-micro-b
+interfaces:
+  - name: Service Port
+    type: 1000base-t
+    mgmt_only: true
+  - name: Redundancy Port
+    type: 1000base-t
+    mgmt_only: true
+  - name: TwoGigabitEthernet0/0/0
+    type: 2.5gbase-t
+  - name: TwoGigabitEthernet0/0/1
+    type: 2.5gbase-t
+  - name: TwoGigabitEthernet0/0/2
+    type: 2.5gbase-t
+  - name: TwoGigabitEthernet0/0/3
+    type: 2.5gbase-t
+  - name: TenGigabitEthernet0/1/0
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet0/1/1
+    type: 10gbase-x-sfpp
+power-ports:
+  - name: PS1
+    type: dc-terminal
+    maximum_draw: 85
diff --git a/device-types/Cisco/C9800-L-RMNT.yaml b/device-types/Cisco/C9800-L-RMNT.yaml
new file mode 100644
index 000000000..c3bf3aa5d
--- /dev/null
+++ b/device-types/Cisco/C9800-L-RMNT.yaml
@@ -0,0 +1,13 @@
+---
+manufacturer: Cisco
+model: Catalyst 9800-L Wireless Controller Rack Mount Tray
+slug: cisco-c9800-l-rmnt
+part_number: C9800-L-RMNT
+u_height: 2
+subdevice_role: parent
+is_full_depth: false
+airflow: passive
+is_powered: false
+device-bays:
+  - name: Left Slot
+  - name: Right Slot