diff --git a/device-types/Cisco/N9K-C93180YC-EX.yaml b/device-types/Cisco/N9K-C93180YC-EX.yaml
index d7cbcca0..e5f4f18b 100644
--- a/device-types/Cisco/N9K-C93180YC-EX.yaml
+++ b/device-types/Cisco/N9K-C93180YC-EX.yaml
@@ -3,6 +3,8 @@ manufacturer: Cisco
 model: Nexus 93180YC-EX
 part_number: N9K-C93180YC-EX
 slug: cisco-n9k-c93180yc-ex
+front_image: true
+rear_image: true
 weight: 7.9
 weight_unit: kg
 u_height: 1
diff --git a/device-types/Cisco/UCS-FI-6536.yaml b/device-types/Cisco/UCS-FI-6536.yaml
new file mode 100644
index 00000000..15e74624
--- /dev/null
+++ b/device-types/Cisco/UCS-FI-6536.yaml
@@ -0,0 +1,115 @@
+---
+manufacturer: Cisco
+model: UCS 6536 Fabric Interconnect
+slug: cisco-ucs-fi-6536
+part_number: UCS-FI-6536
+front_image: true
+rear_image: true
+u_height: 1
+is_full_depth: true
+weight: 11.6
+weight_unit: kg
+console-ports:
+  - name: Console
+    type: rj-45
+interfaces:
+  - name: Management
+    type: 1000base-t
+    mgmt_only: true
+  - name: L1
+    type: 1000base-t
+    mgmt_only: true
+  - name: L2
+    type: 1000base-t
+    mgmt_only: true
+  - name: Ethernet1/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/2
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/3
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/4
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/5
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/6
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/7
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/8
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/9
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/10
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/11
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/12
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/13
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/14
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/15
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/16
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/17
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/18
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/19
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/20
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/21
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/22
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/23
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/24
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/25
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/26
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/27
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/28
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/29
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/30
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/31
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/32
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/33
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/34
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/35
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/36
+    type: 100gbase-x-qsfp28
+module-bays:
+  - name: PS1
+    position: '1'
+    label: Power Supply 1
+  - name: PS2
+    position: '2'
+    label: Power Supply 2
+  - name: Fan 1
+    position: '1'
+  - name: Fan 2
+    position: '2'
+  - name: Fan 3
+    position: '3'
+  - name: Fan 4
+    position: '4'
+  - name: Fan 5
+    position: '5'
+  - name: Fan 6
+    position: '6'
diff --git a/device-types/Cisco/UCS-X210C-M6.yaml b/device-types/Cisco/UCS-X210C-M6.yaml
new file mode 100644
index 00000000..8ad0dc73
--- /dev/null
+++ b/device-types/Cisco/UCS-X210C-M6.yaml
@@ -0,0 +1,12 @@
+---
+manufacturer: Cisco
+model: UCS-X210c-M6
+slug: cisco-ucs-x210c-m6
+part_number: UCS-X210c-M6
+u_height: 0
+is_full_depth: true
+subdevice_role: child
+comments: '[Cisco UCS X210c M6 Compute Node Data Sheet](https://www.cisco.com/c/en/us/products/collateral/servers-unified-computing/ucs-x-series-modular-system/datasheet-c78-2465523.html)'
+airflow: front-to-rear
+weight: 5.83
+weight_unit: kg
diff --git a/device-types/Cisco/UCS-X210C-M7.yaml b/device-types/Cisco/UCS-X210C-M7.yaml
new file mode 100644
index 00000000..1aa4fd2d
--- /dev/null
+++ b/device-types/Cisco/UCS-X210C-M7.yaml
@@ -0,0 +1,12 @@
+---
+manufacturer: Cisco
+model: UCS-X210c-M7
+slug: cisco-ucs-x210c-m7
+part_number: UCS-X210c-M7
+u_height: 0
+is_full_depth: true
+subdevice_role: child
+comments: '[Cisco UCS X210c M7 Compute Node Data Sheet](https://www.cisco.com/c/en/us/products/collateral/servers-unified-computing/ucs-x-series-modular-system/ucs-x210c-m7-compute-node-ds.html)'
+airflow: front-to-rear
+weight: 5.83
+weight_unit: kg
diff --git a/device-types/Cisco/UCS-X9508.yaml b/device-types/Cisco/UCS-X9508.yaml
index b9472b80..2a5f7880 100644
--- a/device-types/Cisco/UCS-X9508.yaml
+++ b/device-types/Cisco/UCS-X9508.yaml
@@ -4,22 +4,32 @@ model: UCS-X9508
 slug: cisco-ucs-x9508
 part_number: UCS-X9508
 comments: '[UCS-X9508 Series Datasheet](https://www.cisco.com/c/en/us/products/collateral/servers-unified-computing/ucs-x-series-modular-system/datasheet-c78-2472574.html)'
+front_image: true
+rear_image: true
 u_height: 7
 is_full_depth: true
 subdevice_role: parent
 airflow: front-to-rear
 weight: 43.09
 weight_unit: kg
-is_powered: false
+is_powered: true
 device-bays:
   - name: slot-1
+    label: '1'
   - name: slot-2
+    label: '2'
   - name: slot-3
+    label: '3'
   - name: slot-4
+    label: '4'
   - name: slot-5
+    label: '5'
   - name: slot-6
+    label: '6'
   - name: slot-7
+    label: '7'
   - name: slot-8
+    label: '8'
 module-bays:
   - name: Intelligent Fabric Module 1
     label: IFM1
diff --git a/device-types/Cisco/UCSB-5108-AC2.yaml b/device-types/Cisco/UCSB-5108-AC2.yaml
index 76dfe782..526bdfcc 100644
--- a/device-types/Cisco/UCSB-5108-AC2.yaml
+++ b/device-types/Cisco/UCSB-5108-AC2.yaml
@@ -3,6 +3,8 @@ manufacturer: Cisco
 model: UCSB-5108-AC2
 slug: cisco-ucsb-5108-ac2
 part_number: UCSB-5108-AC2
+front_image: true
+rear_image: true
 u_height: 6
 is_full_depth: true
 subdevice_role: parent
diff --git a/device-types/Cisco/UCSB-B200-M3.yaml b/device-types/Cisco/UCSB-B200-M3.yaml
index 54a6e264..293ea540 100644
--- a/device-types/Cisco/UCSB-B200-M3.yaml
+++ b/device-types/Cisco/UCSB-B200-M3.yaml
@@ -3,6 +3,8 @@ manufacturer: Cisco
 model: UCSB-B200-M3
 slug: cisco-ucsb-b200-m3
 part_number: UCSB-B200-M3
+front_image: true
+rear_image: false
 u_height: 0
 is_full_depth: true
 subdevice_role: child
diff --git a/device-types/Cisco/UCSB-B200-M4.yaml b/device-types/Cisco/UCSB-B200-M4.yaml
index 5f93b0bf..29388970 100644
--- a/device-types/Cisco/UCSB-B200-M4.yaml
+++ b/device-types/Cisco/UCSB-B200-M4.yaml
@@ -3,6 +3,8 @@ manufacturer: Cisco
 model: UCSB-B200-M4
 slug: cisco-ucsb-b200-m4
 part_number: UCSB-B200-M4
+front_image: true
+rear_image: false
 u_height: 0
 is_full_depth: true
 subdevice_role: child
diff --git a/device-types/Cisco/UCSB-B200-M5.yaml b/device-types/Cisco/UCSB-B200-M5.yaml
index 95479e37..fe63de0d 100644
--- a/device-types/Cisco/UCSB-B200-M5.yaml
+++ b/device-types/Cisco/UCSB-B200-M5.yaml
@@ -3,6 +3,8 @@ manufacturer: Cisco
 model: UCSB-B200-M5
 slug: cisco-ucsb-b200-m5
 part_number: UCSB-B200-M5
+front_image: true
+rear_image: false
 u_height: 0
 is_full_depth: true
 subdevice_role: child
diff --git a/device-types/Cisco/UCSB-B200-M6.yaml b/device-types/Cisco/UCSB-B200-M6.yaml
new file mode 100644
index 00000000..501192e9
--- /dev/null
+++ b/device-types/Cisco/UCSB-B200-M6.yaml
@@ -0,0 +1,14 @@
+---
+manufacturer: Cisco
+model: UCSB-B200-M6
+slug: cisco-ucsb-b200-m6
+part_number: UCSB-B200-M6
+front_image: true
+rear_image: false
+u_height: 0
+is_full_depth: true
+subdevice_role: child
+comments: '[Cisco UCS B200 M6 Blade Server Data Sheet](https://www.cisco.com/c/en/us/products/collateral/servers-unified-computing/ucs-b-series-blade-servers/datasheet-c78-2368888.html)'
+airflow: front-to-rear
+weight: 4.57
+weight_unit: kg
diff --git a/elevation-images/Cisco/cisco-ucs-fi-6536.front.png b/elevation-images/Cisco/cisco-ucs-fi-6536.front.png
new file mode 100644
index 00000000..52df3b6e
Binary files /dev/null and b/elevation-images/Cisco/cisco-ucs-fi-6536.front.png differ
diff --git a/elevation-images/Cisco/cisco-ucs-fi-6536.rear.png b/elevation-images/Cisco/cisco-ucs-fi-6536.rear.png
new file mode 100644
index 00000000..64ed783f
Binary files /dev/null and b/elevation-images/Cisco/cisco-ucs-fi-6536.rear.png differ
diff --git a/elevation-images/Cisco/cisco-ucs-x9508.front.png b/elevation-images/Cisco/cisco-ucs-x9508.front.png
new file mode 100644
index 00000000..45768105
Binary files /dev/null and b/elevation-images/Cisco/cisco-ucs-x9508.front.png differ
diff --git a/elevation-images/Cisco/cisco-ucs-x9508.rear.png b/elevation-images/Cisco/cisco-ucs-x9508.rear.png
new file mode 100644
index 00000000..4ea1fbe7
Binary files /dev/null and b/elevation-images/Cisco/cisco-ucs-x9508.rear.png differ
diff --git a/elevation-images/Cisco/cisco-ucsb-5108-ac2.front.png b/elevation-images/Cisco/cisco-ucsb-5108-ac2.front.png
new file mode 100644
index 00000000..1ce34f70
Binary files /dev/null and b/elevation-images/Cisco/cisco-ucsb-5108-ac2.front.png differ
diff --git a/elevation-images/Cisco/cisco-ucsb-5108-ac2.rear.png b/elevation-images/Cisco/cisco-ucsb-5108-ac2.rear.png
new file mode 100644
index 00000000..d646da9b
Binary files /dev/null and b/elevation-images/Cisco/cisco-ucsb-5108-ac2.rear.png differ
diff --git a/elevation-images/Cisco/cisco-ucsb-b200-m3.front.png b/elevation-images/Cisco/cisco-ucsb-b200-m3.front.png
new file mode 100644
index 00000000..6d1cbac1
Binary files /dev/null and b/elevation-images/Cisco/cisco-ucsb-b200-m3.front.png differ
diff --git a/elevation-images/Cisco/cisco-ucsb-b200-m4.front.png b/elevation-images/Cisco/cisco-ucsb-b200-m4.front.png
new file mode 100644
index 00000000..9e20d8ff
Binary files /dev/null and b/elevation-images/Cisco/cisco-ucsb-b200-m4.front.png differ
diff --git a/elevation-images/Cisco/cisco-ucsb-b200-m5.front.png b/elevation-images/Cisco/cisco-ucsb-b200-m5.front.png
new file mode 100644
index 00000000..e8b16122
Binary files /dev/null and b/elevation-images/Cisco/cisco-ucsb-b200-m5.front.png differ
diff --git a/elevation-images/Cisco/cisco-ucsb-b200-m6.front.png b/elevation-images/Cisco/cisco-ucsb-b200-m6.front.png
new file mode 100644
index 00000000..11daa494
Binary files /dev/null and b/elevation-images/Cisco/cisco-ucsb-b200-m6.front.png differ