diff --git a/custom_components/tuya_local/devices/windcalm_fan.yaml b/custom_components/tuya_local/devices/windcalm_fan.yaml
index 94fc6400ea..434615dfd2 100644
--- a/custom_components/tuya_local/devices/windcalm_fan.yaml
+++ b/custom_components/tuya_local/devices/windcalm_fan.yaml
@@ -8,19 +8,11 @@ primary_entity:
     - id: 62
       type: integer
       name: speed
+      range:
+        min: 0
+        max: 6
       mapping:
-        - dps_val: 1
-          value: 20
-        - dps_val: 2
-          value: 36
-        - dps_val: 3
-          value: 52
-        - dps_val: 4
-          value: 68
-        - dps_val: 5
-          value: 84
-        - dps_val: 6
-          value: 100
+        - scale: 0.06
     - id: 63
       type: string
       name: direction
diff --git a/custom_components/tuya_local/devices/windcalm_fan_with_light.yaml b/custom_components/tuya_local/devices/windcalm_fan_with_light.yaml
index 0a2eeeb35c..698a5f5ce9 100644
--- a/custom_components/tuya_local/devices/windcalm_fan_with_light.yaml
+++ b/custom_components/tuya_local/devices/windcalm_fan_with_light.yaml
@@ -8,19 +8,11 @@ primary_entity:
     - id: 62
       type: integer
       name: speed
+      range:
+        min: 0
+        max: 6
       mapping:
-        - dps_val: 1
-          value: 20
-        - dps_val: 2
-          value: 36
-        - dps_val: 3
-          value: 52
-        - dps_val: 4
-          value: 68
-        - dps_val: 5
-          value: 84
-        - dps_val: 6
-          value: 100
+        - scale: 0.06
     - id: 63
       type: string
       name: direction