diff --git a/device-types/Dell/PowerEdge-R320.yaml b/device-types/Dell/PowerEdge-R320.yaml
index 33252c1bb..37b9d9c12 100644
--- a/device-types/Dell/PowerEdge-R320.yaml
+++ b/device-types/Dell/PowerEdge-R320.yaml
@@ -4,25 +4,17 @@ model: PowerEdge R320
 slug: dell-poweredge-r320
 u_height: 1
 is_full_depth: true
+weight: 19.3
+weight_unit: kg
+airflow: front-to-rear
 console-ports:
   - name: Serial
     type: de-9
-  - name: USB
-    type: usb-a
-console-server-ports:
-  - name: Front USB1
-    type: usb-a
-  - name: Front USB2
-    type: usb-a
-  - name: Rear USB1
-    type: usb-a
-  - name: Rear USB2
-    type: usb-a
-power-ports:
-  - name: Power 1
-    type: iec-60320-c14
-  - name: Power 2
-    type: iec-60320-c14
+module-bays:
+  - name: PSU 1
+    position: '1'
+  - name: PSU 2
+    position: '2'
 interfaces:
   - name: Gig-E 1
     type: 1000base-t
diff --git a/device-types/Dell/PowerEdge-R330.yaml b/device-types/Dell/PowerEdge-R330.yaml
index 46cdabdda..25afa7c88 100644
--- a/device-types/Dell/PowerEdge-R330.yaml
+++ b/device-types/Dell/PowerEdge-R330.yaml
@@ -4,14 +4,17 @@ model: PowerEdge R330
 slug: dell-poweredge-r330
 u_height: 1
 is_full_depth: true
+weight: 26.02
+weight_unit: kg
+airflow: front-to-rear
 console-ports:
   - name: Serial
     type: de-9
-power-ports:
-  - name: Power 1
-    type: iec-60320-c14
-  - name: Power 2
-    type: iec-60320-c14
+module-bays:
+  - name: PSU 1
+    position: '1'
+  - name: PSU 2
+    position: '2'
 interfaces:
   - name: Gig-E 1
     type: 1000base-t
diff --git a/device-types/Dell/PowerEdge-R340.yaml b/device-types/Dell/PowerEdge-R340.yaml
index 9cfb38f4d..a419904c4 100644
--- a/device-types/Dell/PowerEdge-R340.yaml
+++ b/device-types/Dell/PowerEdge-R340.yaml
@@ -4,14 +4,17 @@ model: PowerEdge R340
 slug: dell-poweredge-r340
 u_height: 1
 is_full_depth: true
+weight: 12
+weight_unit: kg
+airflow: front-to-rear
 console-ports:
   - name: Serial
     type: de-9
-power-ports:
-  - name: Power 1
-    type: iec-60320-c14
-  - name: Power 2
-    type: iec-60320-c14
+module-bays:
+  - name: PSU 1
+    position: '1'
+  - name: PSU 2
+    position: '2'
 interfaces:
   - name: Gig-E 1
     type: 1000base-t
diff --git a/device-types/Dell/PowerEdge-R350.yaml b/device-types/Dell/PowerEdge-R350.yaml
index 0588882cc..ef9b9c583 100644
--- a/device-types/Dell/PowerEdge-R350.yaml
+++ b/device-types/Dell/PowerEdge-R350.yaml
@@ -4,6 +4,8 @@ model: PowerEdge R350
 slug: dell-poweredge-r350
 u_height: 1
 is_full_depth: true
+weight: 13
+weight_unit: kg
 airflow: front-to-rear
 front_image: true
 rear_image: true
@@ -13,10 +15,10 @@ console-ports:
 module-bays:
   - name: PSU-1
     label: '1'
-    position: PSU-1
+    position: '1'
   - name: PSU-2
     label: '2'
-    position: PSU-2
+    position: '2'
 interfaces:
   - name: Gig-E 1
     type: 1000base-t
diff --git a/device-types/Dell/PowerEdge-R360.yaml b/device-types/Dell/PowerEdge-R360.yaml
new file mode 100644
index 000000000..d43a6883d
--- /dev/null
+++ b/device-types/Dell/PowerEdge-R360.yaml
@@ -0,0 +1,25 @@
+---
+manufacturer: Dell
+model: PowerEdge R360
+slug: dell-poweredge-r360
+u_height: 1
+is_full_depth: true
+weight: 9
+weight_unit: kg
+airflow: front-to-rear
+console-ports:
+  - name: Serial
+    type: de-9
+module-bays:
+  - name: PSU 1
+    position: '1'
+  - name: PSU 2
+    position: '2'
+interfaces:
+  - name: Gig-E 1
+    type: 1000base-t
+  - name: Gig-E 2
+    type: 1000base-t
+  - name: iDRAC
+    type: 1000base-t
+    mgmt_only: true
diff --git a/device-types/Dell/PowerEdge-R410.yml b/device-types/Dell/PowerEdge-R410.yml
index 77713710e..e14aeba2e 100644
--- a/device-types/Dell/PowerEdge-R410.yml
+++ b/device-types/Dell/PowerEdge-R410.yml
@@ -4,14 +4,17 @@ model: PowerEdge R410
 slug: dell-poweredge-r410
 u_height: 1
 is_full_depth: true
+weight: 15.9
+weight_unit: kg
+airflow: front-to-rear
 console-ports:
   - name: Serial
     type: de-9
-power-ports:
-  - name: Power 1
-    type: iec-60320-c14
-  - name: Power 2
-    type: iec-60320-c14
+module-bays:
+  - name: PSU 1
+    position: '1'
+  - name: PSU 2
+    position: '2'
 interfaces:
   - name: Gig-E 1
     type: 1000base-t
diff --git a/device-types/Dell/PowerEdge-R415.yml b/device-types/Dell/PowerEdge-R415.yml
index 7ec093ada..72891ae1d 100644
--- a/device-types/Dell/PowerEdge-R415.yml
+++ b/device-types/Dell/PowerEdge-R415.yml
@@ -4,14 +4,17 @@ model: PowerEdge R415
 slug: dell-poweredge-r415
 u_height: 1
 is_full_depth: true
+weight: 15.9
+weight_unit: kg
+airflow: front-to-rear
 console-ports:
   - name: Serial
     type: de-9
-power-ports:
-  - name: Power 1
-    type: iec-60320-c14
-  - name: Power 2
-    type: iec-60320-c14
+module-bays:
+  - name: PSU 1
+    position: '1'
+  - name: PSU 2
+    position: '2'
 interfaces:
   - name: Gig-E 1
     type: 1000base-t
diff --git a/device-types/Dell/PowerEdge-R420.yaml b/device-types/Dell/PowerEdge-R420.yaml
index bd1d95cee..57fb74e00 100644
--- a/device-types/Dell/PowerEdge-R420.yaml
+++ b/device-types/Dell/PowerEdge-R420.yaml
@@ -4,14 +4,12 @@ model: PowerEdge R420
 slug: dell-poweredge-r420
 u_height: 1
 is_full_depth: true
+weight: 19.9
+weight_unit: kg
+airflow: front-to-rear
 console-ports:
   - name: Serial
     type: de-9
-power-ports:
-  - name: Power 1
-    type: iec-60320-c14
-  - name: Power 2
-    type: iec-60320-c14
 interfaces:
   - name: Gig-E 1
     type: 1000base-t
@@ -21,6 +19,10 @@ interfaces:
     type: 1000base-t
     mgmt_only: true
 module-bays:
+  - name: PSU 1
+    position: '1'
+  - name: PSU 2
+    position: '2'
   - name: Riser PCIe slot 1
     position: PCIe-1
     label: '1'
diff --git a/device-types/Dell/PowerEdge-R430.yml b/device-types/Dell/PowerEdge-R430.yml
index a09469a4c..78737cd12 100644
--- a/device-types/Dell/PowerEdge-R430.yml
+++ b/device-types/Dell/PowerEdge-R430.yml
@@ -4,16 +4,19 @@ model: PowerEdge R430
 slug: dell-poweredge-r430
 u_height: 1
 is_full_depth: true
+weight: 19.9
+weight_unit: kg
+airflow: front-to-rear
 front_image: true
 rear_image: true
 console-ports:
   - name: Serial
     type: de-9
-power-ports:
-  - name: Power 1
-    type: iec-60320-c14
-  - name: Power 2
-    type: iec-60320-c14
+module-bays:
+  - name: PSU 1
+    position: '1'
+  - name: PSU 2
+    position: '2'
 interfaces:
   - name: Gig-E 1
     type: 1000base-t
diff --git a/device-types/Dell/PowerEdge-R440.yml b/device-types/Dell/PowerEdge-R440.yml
index 0d220f884..932beba11 100644
--- a/device-types/Dell/PowerEdge-R440.yml
+++ b/device-types/Dell/PowerEdge-R440.yml
@@ -4,14 +4,17 @@ model: PowerEdge R440
 slug: dell-poweredge-r440
 u_height: 1
 is_full_depth: true
+weight: 17.64
+weight_unit: kg
+airflow: front-to-rear
 console-ports:
   - name: Serial
     type: de-9
-power-ports:
-  - name: Power 1
-    type: iec-60320-c14
-  - name: Power 2
-    type: iec-60320-c14
+module-bays:
+  - name: PSU 1
+    position: '1'
+  - name: PSU 2
+    position: '2'
 interfaces:
   - name: Gig-E 1
     type: 1000base-t
diff --git a/device-types/Dell/PowerEdge-R450.yml b/device-types/Dell/PowerEdge-R450.yml
index b21f098c0..c3a81e322 100644
--- a/device-types/Dell/PowerEdge-R450.yml
+++ b/device-types/Dell/PowerEdge-R450.yml
@@ -4,15 +4,17 @@ model: PowerEdge R450
 slug: dell-poweredge-r450
 u_height: 1
 is_full_depth: true
-subdevice_role: parent
+weight: 18.62
+weight_unit: kg
+airflow: front-to-rear
 console-ports:
   - name: Serial
     type: de-9
-power-ports:
-  - name: Power 1
-    type: iec-60320-c14
-  - name: Power 2
-    type: iec-60320-c14
+module-bays:
+  - name: PSU 1
+    position: '1'
+  - name: PSU 2
+    position: '2'
 interfaces:
   - name: Gig-E 1
     type: 1000base-t
diff --git a/device-types/Dell/PowerEdge-R530.yml b/device-types/Dell/PowerEdge-R530.yml
index 071aeace2..91395b267 100644
--- a/device-types/Dell/PowerEdge-R530.yml
+++ b/device-types/Dell/PowerEdge-R530.yml
@@ -4,15 +4,14 @@ model: PowerEdge R530
 slug: dell-poweredge-r530
 u_height: 2
 is_full_depth: true
-subdevice_role: parent
+front_image: true
+rear_image: true
+weight: 28.2
+weight_unit: kg
+airflow: front-to-rear
 console-ports:
   - name: Serial
     type: de-9
-power-ports:
-  - name: Power 1
-    type: iec-60320-c14
-  - name: Power 2
-    type: iec-60320-c14
 interfaces:
   - name: Gig-E 1
     type: 1000base-t
@@ -26,6 +25,10 @@ interfaces:
     type: 1000base-t
     mgmt_only: true
 module-bays:
+  - name: PSU 1
+    position: '1'
+  - name: PSU 2
+    position: '2'
   - name: PCIe slot 1
     position: PCIe-1
     label: '1'
diff --git a/device-types/Dell/PowerEdge-R540.yaml b/device-types/Dell/PowerEdge-R540.yaml
index fce1877ed..7fb2ecfce 100644
--- a/device-types/Dell/PowerEdge-R540.yaml
+++ b/device-types/Dell/PowerEdge-R540.yaml
@@ -4,14 +4,19 @@ model: PowerEdge R540
 slug: dell-poweredge-r540
 u_height: 2
 is_full_depth: true
+front_image: true
+rear_image: true
+weight: 29.68
+weight_unit: kg
+airflow: front-to-rear
 console-ports:
   - name: Serial
     type: de-9
-power-ports:
-  - name: Power 1
-    type: iec-60320-c14
-  - name: Power 2
-    type: iec-60320-c14
+module-bays:
+  - name: PSU 1
+    position: '1'
+  - name: PSI 2
+    position: '2'
 interfaces:
   - name: Gig-E 1
     type: 1000base-t
diff --git a/device-types/Dell/PowerEdge-R620.yaml b/device-types/Dell/PowerEdge-R620.yaml
index 70a662cdd..7f07ac592 100644
--- a/device-types/Dell/PowerEdge-R620.yaml
+++ b/device-types/Dell/PowerEdge-R620.yaml
@@ -4,14 +4,17 @@ model: PowerEdge R620
 slug: dell-poweredge-r620
 u_height: 1
 is_full_depth: true
+weight: 18.6
+weight_unit: kg
+airflow: front-to-rear
 console-ports:
   - name: Serial
     type: de-9
-power-ports:
-  - name: Power 1
-    type: iec-60320-c14
-  - name: Power 2
-    type: iec-60320-c14
+module-bays:
+  - name: PSU 1
+    position: '1'
+  - name: PSU 2
+    position: '2'
 interfaces:
   - name: Gig-E 1
     type: 1000base-t
diff --git a/device-types/Dell/PowerEdge-R630.yaml b/device-types/Dell/PowerEdge-R630.yaml
index c01e24928..aa25d873d 100644
--- a/device-types/Dell/PowerEdge-R630.yaml
+++ b/device-types/Dell/PowerEdge-R630.yaml
@@ -6,6 +6,9 @@ u_height: 1
 is_full_depth: true
 front_image: true
 rear_image: true
+weight: 18.5
+weight_unit: kg
+airflow: front-to-rear
 console-ports:
   - name: Serial
     type: de-9
@@ -16,10 +19,10 @@ interfaces:
 module-bays:
   - name: PSU-1
     label: '1'
-    position: PSU-1
+    position: '1'
   - name: PSU-2
     label: '2'
-    position: PSU-2
+    position: '2'
   - name: Network Daughter Card slot 1
     position: NDC-1
   - name: Riser PCIe-Gen3 1
diff --git a/device-types/Dell/PowerEdge-R720.yaml b/device-types/Dell/PowerEdge-R720.yaml
index 6ec7ec683..575928c10 100644
--- a/device-types/Dell/PowerEdge-R720.yaml
+++ b/device-types/Dell/PowerEdge-R720.yaml
@@ -4,23 +4,20 @@ model: PowerEdge R720
 slug: dell-poweredge-r720
 u_height: 2
 is_full_depth: true
+weight: 29.5
+weight_unit: kg
+airflow: front-to-rear
 console-ports:
   - name: Serial
     type: de-9
-power-ports:
-  - name: Power 1
-    type: iec-60320-c14
-  - name: Power 2
-    type: iec-60320-c14
+module-bays:
+  - name: PSU 1
+    position: '1'
+  - name: PSU 2
+    position: '2'
+  - name: Network Daughter Card slot 1
+    position: NDC-1
 interfaces:
-  - name: Gig-E 1
-    type: 1000base-t
-  - name: Gig-E 2
-    type: 1000base-t
-  - name: Gig-E 3
-    type: 1000base-t
-  - name: Gig-E 4
-    type: 1000base-t
   - name: iDRAC
     type: 1000base-t
     mgmt_only: true
diff --git a/device-types/Dell/PowerEdge-R730.yaml b/device-types/Dell/PowerEdge-R730.yaml
index c9be09033..8af624360 100644
--- a/device-types/Dell/PowerEdge-R730.yaml
+++ b/device-types/Dell/PowerEdge-R730.yaml
@@ -4,14 +4,17 @@ model: PowerEdge R730
 slug: dell-poweredge-r730
 u_height: 2
 is_full_depth: true
+weight: 31.5
+weight_unit: kg
+airflow: front-to-rear
 console-ports:
   - name: Serial
     type: de-9
-power-ports:
-  - name: Power 1
-    type: iec-60320-c14
-  - name: Power 2
-    type: iec-60320-c14
+module-bays:
+  - name: PSU 1
+    position: '1'
+  - name: PSU 2
+    position: '2'
 interfaces:
   - name: Gig-E 1
     type: 1000base-t
diff --git a/device-types/Dell/PowerEdge-R740.yaml b/device-types/Dell/PowerEdge-R740.yaml
index c92fdeb89..08e21548a 100644
--- a/device-types/Dell/PowerEdge-R740.yaml
+++ b/device-types/Dell/PowerEdge-R740.yaml
@@ -15,10 +15,10 @@ interfaces:
 module-bays:
   - name: PSU-1
     label: '1'
-    position: PSU-1
+    position: '1'
   - name: PSU-2
     label: '2'
-    position: PSU-2
+    position: '2'
   - name: NUMA 0 - NDC slot 1
     position: NDC-1
   - name: NUMA 0 - PCIe slot 1 - FH
diff --git a/device-types/Dell/PowerEdge-R750.yml b/device-types/Dell/PowerEdge-R750.yml
index 66dc28fdf..bff8632fe 100644
--- a/device-types/Dell/PowerEdge-R750.yml
+++ b/device-types/Dell/PowerEdge-R750.yml
@@ -4,6 +4,9 @@ model: PowerEdge R750
 slug: dell-poweredge-r750
 u_height: 2
 is_full_depth: true
+weight: 27.7
+weight_unit: kg
+airflow: front-to-rear
 comments: '[Technical Guide](https://i.dell.com/sites/csdocuments/Product_Docs/en/poweredge-r750-technical-guide.pdf)'
 console-ports:
   - name: Rear Serial
@@ -16,10 +19,10 @@ interfaces:
 module-bays:
   - name: PSU-1
     label: '1'
-    position: PSU-1
+    position: '1'
   - name: PSU-2
     label: '2'
-    position: PSU-2
+    position: '2'
   - name: NUMA 0 - OCP slot 1
     position: OCP-1
   - name: NUMA 0 - PCIe slot 1 - FH
diff --git a/device-types/Dell/PowerEdge-R760.yml b/device-types/Dell/PowerEdge-R760.yml
index 8304a3b70..a93c59b7c 100644
--- a/device-types/Dell/PowerEdge-R760.yml
+++ b/device-types/Dell/PowerEdge-R760.yml
@@ -4,6 +4,9 @@ model: PowerEdge R760
 slug: dell-poweredge-r760
 u_height: 2
 is_full_depth: true
+weight: 25.1
+weight_unit: kg
+airflow: front-to-rear
 comments: '[Technical Guide](https://i.dell.com/sites/csdocuments/Product_Docs/en/poweredge-r760-technical-guide.pdf)'
 console-ports:
   - name: Rear Serial
@@ -16,10 +19,10 @@ interfaces:
 module-bays:
   - name: PSU-1
     label: '1'
-    position: PSU-1
+    position: '1'
   - name: PSU-2
     label: '2'
-    position: PSU-2
+    position: '2'
   - name: NUMA 0 - OCP slot 1
     position: OCP-1
   - name: NUMA 0 - PCIe slot 1 - FH
diff --git a/elevation-images/Dell/dell-poweredge-R530.front.jpg b/elevation-images/Dell/dell-poweredge-r530.front.jpg
similarity index 100%
rename from elevation-images/Dell/dell-poweredge-R530.front.jpg
rename to elevation-images/Dell/dell-poweredge-r530.front.jpg
diff --git a/elevation-images/Dell/dell-poweredge-R530.rear.jpg b/elevation-images/Dell/dell-poweredge-r530.rear.jpg
similarity index 100%
rename from elevation-images/Dell/dell-poweredge-R530.rear.jpg
rename to elevation-images/Dell/dell-poweredge-r530.rear.jpg
diff --git a/elevation-images/Dell/dell-poweredge-R540.front.jpg b/elevation-images/Dell/dell-poweredge-r540.front.jpg
similarity index 100%
rename from elevation-images/Dell/dell-poweredge-R540.front.jpg
rename to elevation-images/Dell/dell-poweredge-r540.front.jpg
diff --git a/elevation-images/Dell/dell-poweredge-R540.rear.jpg b/elevation-images/Dell/dell-poweredge-r540.rear.jpg
similarity index 100%
rename from elevation-images/Dell/dell-poweredge-R540.rear.jpg
rename to elevation-images/Dell/dell-poweredge-r540.rear.jpg