diff --git a/packages/vacuum/vacuum.yaml b/packages/vacuum/vacuum.yaml
index 36b536f..6218cb7 100644
--- a/packages/vacuum/vacuum.yaml
+++ b/packages/vacuum/vacuum.yaml
@@ -43,22 +43,22 @@ template:
     - name: Furbot Main Brush Life Pct
       state_class: measurement
       unit_of_measurement: "%"
-      state: "{{ (states('sensor.valetudo_furbot_main_brush') | default(7200) | float) / (states('input_number.furbot_main_brush_life_hours') * 3600) }}"
+      state: "{{ (states('sensor.valetudo_furbot_main_brush')|default(120)|float) / (states('input_number.furbot_main_brush_life_hours')|float * 60) }}"
 
     - name: Furbot Right Brush Life Pct
       state_class: measurement
       unit_of_measurement: "%"
-      state: "{{ (states('sensor.valetudo_furbot_right_brush') | default(7200) | default | float) / (states('input_number.furbot_right_brush_life_hours') * 3600) }}"
+      state: "{{ (states('sensor.valetudo_furbot_right_brush')|default(120)|float) / (states('input_number.furbot_right_brush_life_hours')|float * 60) }}"
 
     - name: Furbot Filter Life Pct
       state_class: measurement
       unit_of_measurement: "%"
-      state: "{{ (states('sensor.valetudo_furbot_main_filter') | default(7200) | float) / (states('input_number.furbot_filter_life_hours') * 3600) }}"
+      state: "{{ (states('sensor.valetudo_furbot_main_filter')|default(120)|float) / (states('input_number.furbot_filter_life_hours')|float * 60) }}"
 
     - name: Furbot Sensor Cleaning Pct
       state_class: measurement
       unit_of_measurement: "%"
-      state: "{{ (states('sensor.valetudo_furbot_sensor_cleaning') | default(7200) | float) / (states('input_number.furbot_sensor_life_hours') * 3600) }}"
+      state: "{{ (states('sensor.valetudo_furbot_sensor_cleaning')|default(120)|float) / (states('input_number.furbot_sensor_life_hours')|float * 60) }}"
 
 # -----------------------------------------------------------------------------
 # Vacuum Scripts