diff --git a/device-types/Cisco/C9500-12Q.yaml b/device-types/Cisco/C9500-12Q.yaml
new file mode 100644
index 000000000..5b73e0f67
--- /dev/null
+++ b/device-types/Cisco/C9500-12Q.yaml
@@ -0,0 +1,51 @@
+---
+manufacturer: Cisco
+model: Catalyst 9500-12Q
+slug: cisco-c9500-12q
+part_number: C9500-12q
+u_height: 1
+weight: 11.68
+weight_unit: kg
+airflow: front-to-rear
+is_full_depth: true
+comments: '[Cisco Catalyst 9500 Series Switches Data Sheet](https://www.cisco.com/c/en/us/products/collateral/switches/catalyst-9500-series-switches/nb-06-cat9500-ser-data-sheet-cte-en.html)'
+console-ports:
+  - name: con 0
+    type: rj-45
+  - name: usb
+    type: usb-mini-b
+interfaces:
+  - name: GigabitEthernet0/0
+    type: 1000base-t
+    mgmt_only: true
+  - name: FortyGigabitEthernet1/0/1
+    type: 40gbase-x-qsfpp
+  - name: FortyGigabitEthernet1/0/2
+    type: 40gbase-x-qsfpp
+  - name: FortyGigabitEthernet1/0/3
+    type: 40gbase-x-qsfpp
+  - name: FortyGigabitEthernet1/0/4
+    type: 40gbase-x-qsfpp
+  - name: FortyGigabitEthernet1/0/5
+    type: 40gbase-x-qsfpp
+  - name: FortyGigabitEthernet1/0/6
+    type: 40gbase-x-qsfpp
+  - name: FortyGigabitEthernet1/0/7
+    type: 40gbase-x-qsfpp
+  - name: FortyGigabitEthernet1/0/8
+    type: 40gbase-x-qsfpp
+  - name: FortyGigabitEthernet1/0/9
+    type: 40gbase-x-qsfpp
+  - name: FortyGigabitEthernet1/0/10
+    type: 40gbase-x-qsfpp
+  - name: FortyGigabitEthernet1/0/11
+    type: 40gbase-x-qsfpp
+  - name: FortyGigabitEthernet1/0/12
+    type: 40gbase-x-qsfpp
+module-bays:
+  - name: Power Supply Module 1
+    label: PS1
+    position: '1'
+  - name: Power Supply Module 2
+    label: PS2
+    position: '2'
diff --git a/module-types/Cisco/PWR-C4-950WAC-R.yaml b/module-types/Cisco/PWR-C4-950WAC-R.yaml
new file mode 100644
index 000000000..1de61d332
--- /dev/null
+++ b/module-types/Cisco/PWR-C4-950WAC-R.yaml
@@ -0,0 +1,8 @@
+---
+manufacturer: Cisco
+model: PWR-C4-950WAC-R
+part_number: PWR-C4-950WAC-R
+power-ports:
+  - name: PSU{module}
+    type: iec-60320-c14
+    maximum_draw: 950