diff --git a/device-types/F5/BIG-IP-i5600.yaml b/device-types/F5/BIG-IP-i5600.yaml
index 7dd53fff5..a5517a6d5 100644
--- a/device-types/F5/BIG-IP-i5600.yaml
+++ b/device-types/F5/BIG-IP-i5600.yaml
@@ -3,9 +3,10 @@ manufacturer: F5
 model: BIG-IP i5600
 slug: f5-big-ip-i5600
 part_number: i5600
+#default_platform: TSOM
 u_height: 1
 is_full_depth: true
-weight: 76
+weight: 24.5
 weight_unit: lb
 airflow: front-to-rear
 front_image: true
diff --git a/device-types/F5/BIG-IP-i5800.yaml b/device-types/F5/BIG-IP-i5800.yaml
index 08d4492ec..1df4ff990 100644
--- a/device-types/F5/BIG-IP-i5800.yaml
+++ b/device-types/F5/BIG-IP-i5800.yaml
@@ -3,8 +3,11 @@ manufacturer: F5
 model: BIG-IP i5800
 slug: f5-big-ip-i5800
 part_number: i5800
+#default_platform: TSOM
 u_height: 1
 is_full_depth: true
+weight: 24.5
+weight_unit: lb
 airflow: front-to-rear
 front_image: true
 rear_image: true
@@ -15,13 +18,6 @@ console-ports:
     type: usb-a
   - name: Failover
     type: rj-45
-power-ports:
-  - name: psu1
-    type: iec-60320-c14
-    maximum_draw: 330
-  - name: psu2
-    type: iec-60320-c14
-    maximum_draw: 330
 interfaces:
   - name: mgmt
     type: 1000base-t
@@ -50,3 +46,8 @@ interfaces:
     type: 40gbase-x-qsfpp
   - name: '6.0'
     type: 40gbase-x-qsfpp
+module-bays:
+  - name: psu1
+    position: '1'
+  - name: psu2
+    position: '2'
diff --git a/module-types/F5/PWR-0306.yaml b/module-types/F5/PWR-0306.yaml
index c5aad14b7..9b1a0c297 100644
--- a/module-types/F5/PWR-0306.yaml
+++ b/module-types/F5/PWR-0306.yaml
@@ -2,6 +2,10 @@
 manufacturer: F5
 model: PWR-0306
 part_number: PWR-0306
+description: 650W AC PS for Big-IP i5000/i7000/i10000/i11000 and r5000
+weight: 0.91
+weight_unit: kg
 power-ports:
   - name: PSU{module}
     type: iec-60320-c14
+    maximum_draw: 650