diff --git a/device-types/Lenovo/RackSwitch-G8052.yaml b/device-types/Lenovo/RackSwitch-G8052.yaml
new file mode 100644
index 000000000..a0ed38af3
--- /dev/null
+++ b/device-types/Lenovo/RackSwitch-G8052.yaml
@@ -0,0 +1,192 @@
+---
+manufacturer: Lenovo
+model: RackSwitch G8052
+slug: lenovo-rackswitch-g8052
+part_number: 715952F
+u_height: 1.0
+is_full_depth: true
+airflow: front-to-rear
+front_image: true
+weight: 23.1
+weight_unit: lb
+comments: Comes with 2 PSU and 3 Fan modules
+console-ports:
+  - name: Serial
+    type: usb-mini-a
+    label: Serial
+interfaces:
+  - name: '1'
+    type: 1000base-tx
+    label: '1'
+  - name: '2'
+    type: 1000base-tx
+    label: '2'
+  - name: '3'
+    type: 1000base-tx
+    label: '3'
+  - name: '4'
+    type: 1000base-tx
+    label: '4'
+  - name: '5'
+    type: 1000base-tx
+    label: '5'
+  - name: '6'
+    type: 1000base-tx
+    label: '6'
+  - name: '7'
+    type: 1000base-tx
+    label: '7'
+  - name: '8'
+    type: 1000base-tx
+    label: '8'
+  - name: '9'
+    type: 1000base-tx
+    label: '9'
+  - name: '10'
+    type: 1000base-tx
+    label: '10'
+  - name: '11'
+    type: 1000base-tx
+    label: '11'
+  - name: '12'
+    type: 1000base-tx
+    label: '12'
+  - name: '13'
+    type: 1000base-tx
+    label: '13'
+  - name: '14'
+    type: 1000base-tx
+    label: '14'
+  - name: '15'
+    type: 1000base-tx
+    label: '15'
+  - name: '16'
+    type: 1000base-tx
+    label: '16'
+  - name: '17'
+    type: 1000base-tx
+    label: '17'
+  - name: '18'
+    type: 1000base-tx
+    label: '18'
+  - name: '19'
+    type: 1000base-tx
+    label: '19'
+  - name: '20'
+    type: 1000base-tx
+    label: '20'
+  - name: '21'
+    type: 1000base-tx
+    label: '21'
+  - name: '22'
+    type: 1000base-tx
+    label: '22'
+  - name: '23'
+    type: 1000base-tx
+    label: '23'
+  - name: '24'
+    type: 1000base-tx
+    label: '24'
+  - name: '25'
+    type: 1000base-tx
+    label: '25'
+  - name: '26'
+    type: 1000base-tx
+    label: '26'
+  - name: '27'
+    type: 1000base-tx
+    label: '27'
+  - name: '28'
+    type: 1000base-tx
+    label: '28'
+  - name: '29'
+    type: 1000base-tx
+    label: '29'
+  - name: '30'
+    type: 1000base-tx
+    label: '30'
+  - name: '31'
+    type: 1000base-tx
+    label: '31'
+  - name: '32'
+    type: 1000base-tx
+    label: '32'
+  - name: '33'
+    type: 1000base-tx
+    label: '33'
+  - name: '34'
+    type: 1000base-tx
+    label: '34'
+  - name: '35'
+    type: 1000base-tx
+    label: '35'
+  - name: '36'
+    type: 1000base-tx
+    label: '36'
+  - name: '37'
+    type: 1000base-tx
+    label: '37'
+  - name: '38'
+    type: 1000base-tx
+    label: '38'
+  - name: '39'
+    type: 1000base-tx
+    label: '39'
+  - name: '40'
+    type: 1000base-tx
+    label: '40'
+  - name: '41'
+    type: 1000base-tx
+    label: '41'
+  - name: '42'
+    type: 1000base-tx
+    label: '42'
+  - name: '43'
+    type: 1000base-tx
+    label: '43'
+  - name: '44'
+    type: 1000base-tx
+    label: '44'
+  - name: '45'
+    type: 1000base-tx
+    label: '45'
+  - name: '46'
+    type: 1000base-tx
+    label: '46'
+  - name: '47'
+    type: 1000base-tx
+    label: '47'
+  - name: '48'
+    type: 1000base-tx
+    label: '48'
+  - name: XGE1
+    type: 10gbase-x-sfpp
+    label: '49'
+  - name: XGE2
+    type: 10gbase-x-sfpp
+    label: '50'
+  - name: XGE3
+    type: 10gbase-x-sfpp
+    label: '51'
+  - name: XGE4
+    type: 10gbase-x-sfpp
+    label: '52'
+module-bays:
+  - name: FAN1
+    label: FAN1
+    position: FAN1
+  - name: FAN2
+    label: FAN2
+    position: FAN2
+  - name: FAN3
+    label: FAN3
+    position: FAN3
+  - name: FAN4
+    label: FAN4
+    position: FAN4
+  - name: PWR1
+    label: PWR1
+    position: PWR1
+  - name: PWR2
+    label: PWR2
+    position: PWR2
diff --git a/elevation-images/Lenovo/lenovo-rackswitch-g8052.front.jpg b/elevation-images/Lenovo/lenovo-rackswitch-g8052.front.jpg
new file mode 100644
index 000000000..4c25779e9
Binary files /dev/null and b/elevation-images/Lenovo/lenovo-rackswitch-g8052.front.jpg differ
diff --git a/module-types/Lenovo/00D6071.yaml b/module-types/Lenovo/00D6071.yaml
new file mode 100644
index 000000000..5692b5108
--- /dev/null
+++ b/module-types/Lenovo/00D6071.yaml
@@ -0,0 +1,5 @@
+---
+manufacturer: Lenovo
+description: RackSwitch Hot-Swap, Rear-to-Front Fan Assembly
+part_number: 00D6071
+model: 00D6071
diff --git a/module-types/Lenovo/00D6073.yaml b/module-types/Lenovo/00D6073.yaml
new file mode 100644
index 000000000..745280b76
--- /dev/null
+++ b/module-types/Lenovo/00D6073.yaml
@@ -0,0 +1,5 @@
+---
+manufacturer: Lenovo
+description: RackSwitch Hot-Swap, Front-to-Rear Fan Assembly
+part_number: 00D6073
+model: 00D6073
diff --git a/module-types/Lenovo/49Y7937.yaml b/module-types/Lenovo/49Y7937.yaml
new file mode 100644
index 000000000..641847693
--- /dev/null
+++ b/module-types/Lenovo/49Y7937.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: Lenovo
+description: RackSwitch Hot-Swap, Front-to-Rear 450W Power Supply
+part_number: 49Y7937
+model: 49Y7937
+power-ports:
+  - name: '{module}.IN'
+    type: iec-60320-c14
+    maximum_draw: 450
diff --git a/module-types/Lenovo/49Y7938.yaml b/module-types/Lenovo/49Y7938.yaml
new file mode 100644
index 000000000..92ef8daf5
--- /dev/null
+++ b/module-types/Lenovo/49Y7938.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: Lenovo
+description: RackSwitch Hot-Swap, Rear-to-Front 450W Power Supply
+part_number: 49Y7938
+model: 49Y7938
+power-ports:
+  - name: '{module}.IN'
+    type: iec-60320-c14
+    maximum_draw: 450