diff --git a/dashboards/views/11_vedligehold.yaml b/dashboards/views/11_vedligehold.yaml
index ae7062a..515e018 100644
--- a/dashboards/views/11_vedligehold.yaml
+++ b/dashboards/views/11_vedligehold.yaml
@@ -1739,30 +1739,6 @@ sections:
           type: heading
           heading: Havesensorer
 
-      # Kanal 1 - fugt
-      - type: conditional
-        conditions:
-          - condition: state
-            entity: input_boolean.vis_alle_vedligehold
-            state: "on"
-        card:
-          type: tile
-          entity: sensor.annes_havesensor_soil_moisture_1
-          name: Havesensor 1 fugt
-
-      - type: conditional
-        conditions:
-          - condition: state
-            entity: input_boolean.vis_alle_vedligehold
-            state: "off"
-          - condition: state
-            entity: sensor.annes_havesensor_soil_moisture_1
-            state: unavailable
-        card:
-          type: tile
-          entity: sensor.annes_havesensor_soil_moisture_1
-          name: Havesensor 1 fugt
-
       # Kanal 1 - batteri
       - type: conditional
         conditions:
@@ -1779,38 +1755,19 @@ sections:
           - condition: state
             entity: input_boolean.vis_alle_vedligehold
             state: "off"
-          - condition: numeric_state
-            entity: sensor.annes_havesensor_soil_battery_1
-            below: 1.2
+          - condition: or
+            conditions:
+              - condition: state
+                entity: sensor.annes_havesensor_soil_battery_1
+                state: unavailable
+              - condition: numeric_state
+                entity: sensor.annes_havesensor_soil_battery_1
+                below: 1.2
         card:
           type: tile
           entity: sensor.annes_havesensor_soil_battery_1
           name: Havesensor 1 batteri
 
-      # Kanal 2 - fugt
-      - type: conditional
-        conditions:
-          - condition: state
-            entity: input_boolean.vis_alle_vedligehold
-            state: "on"
-        card:
-          type: tile
-          entity: sensor.annes_havesensor_soil_moisture_2
-          name: Havesensor 2 fugt
-
-      - type: conditional
-        conditions:
-          - condition: state
-            entity: input_boolean.vis_alle_vedligehold
-            state: "off"
-          - condition: state
-            entity: sensor.annes_havesensor_soil_moisture_2
-            state: unavailable
-        card:
-          type: tile
-          entity: sensor.annes_havesensor_soil_moisture_2
-          name: Havesensor 2 fugt
-
       # Kanal 2 - batteri
       - type: conditional
         conditions:
@@ -1827,38 +1784,19 @@ sections:
           - condition: state
             entity: input_boolean.vis_alle_vedligehold
             state: "off"
-          - condition: numeric_state
-            entity: sensor.annes_havesensor_soil_battery_2
-            below: 1.2
+          - condition: or
+            conditions:
+              - condition: state
+                entity: sensor.annes_havesensor_soil_battery_2
+                state: unavailable
+              - condition: numeric_state
+                entity: sensor.annes_havesensor_soil_battery_2
+                below: 1.2
         card:
           type: tile
           entity: sensor.annes_havesensor_soil_battery_2
           name: Havesensor 2 batteri
 
-      # Kanal 3 - fugt
-      - type: conditional
-        conditions:
-          - condition: state
-            entity: input_boolean.vis_alle_vedligehold
-            state: "on"
-        card:
-          type: tile
-          entity: sensor.annes_havesensor_soil_moisture_3
-          name: Havesensor 3 fugt
-
-      - type: conditional
-        conditions:
-          - condition: state
-            entity: input_boolean.vis_alle_vedligehold
-            state: "off"
-          - condition: state
-            entity: sensor.annes_havesensor_soil_moisture_3
-            state: unavailable
-        card:
-          type: tile
-          entity: sensor.annes_havesensor_soil_moisture_3
-          name: Havesensor 3 fugt
-
       # Kanal 3 - batteri
       - type: conditional
         conditions:
@@ -1875,38 +1813,19 @@ sections:
           - condition: state
             entity: input_boolean.vis_alle_vedligehold
             state: "off"
-          - condition: numeric_state
-            entity: sensor.annes_havesensor_soil_battery_3
-            below: 1.2
+          - condition: or
+            conditions:
+              - condition: state
+                entity: sensor.annes_havesensor_soil_battery_3
+                state: unavailable
+              - condition: numeric_state
+                entity: sensor.annes_havesensor_soil_battery_3
+                below: 1.2
         card:
           type: tile
           entity: sensor.annes_havesensor_soil_battery_3
           name: Havesensor 3 batteri
 
-      # Kanal 4 - fugt
-      - type: conditional
-        conditions:
-          - condition: state
-            entity: input_boolean.vis_alle_vedligehold
-            state: "on"
-        card:
-          type: tile
-          entity: sensor.annes_havesensor_soil_moisture_4
-          name: Havesensor 4 fugt
-
-      - type: conditional
-        conditions:
-          - condition: state
-            entity: input_boolean.vis_alle_vedligehold
-            state: "off"
-          - condition: state
-            entity: sensor.annes_havesensor_soil_moisture_4
-            state: unavailable
-        card:
-          type: tile
-          entity: sensor.annes_havesensor_soil_moisture_4
-          name: Havesensor 4 fugt
-
       # Kanal 4 - batteri
       - type: conditional
         conditions:
@@ -1923,9 +1842,14 @@ sections:
           - condition: state
             entity: input_boolean.vis_alle_vedligehold
             state: "off"
-          - condition: numeric_state
-            entity: sensor.annes_havesensor_soil_battery_4
-            below: 1.2
+          - condition: or
+            conditions:
+              - condition: state
+                entity: sensor.annes_havesensor_soil_battery_4
+                state: unavailable
+              - condition: numeric_state
+                entity: sensor.annes_havesensor_soil_battery_4
+                below: 1.2
         card:
           type: tile
           entity: sensor.annes_havesensor_soil_battery_4
diff --git a/include/templates/maintenance.yaml b/include/templates/maintenance.yaml
index f72b757..3c4137d 100644
--- a/include/templates/maintenance.yaml
+++ b/include/templates/maintenance.yaml
@@ -146,10 +146,10 @@
       unique_id: maintenance_garden_sensors_needed
       state: >-
         {{
-          states('sensor.annes_havesensor_soil_moisture_1') in ['unavailable', 'unknown']
-          or states('sensor.annes_havesensor_soil_moisture_2') in ['unavailable', 'unknown']
-          or states('sensor.annes_havesensor_soil_moisture_3') in ['unavailable', 'unknown']
-          or states('sensor.annes_havesensor_soil_moisture_4') in ['unavailable', 'unknown']
+          states('sensor.annes_havesensor_soil_battery_1') in ['unavailable', 'unknown']
+          or states('sensor.annes_havesensor_soil_battery_2') in ['unavailable', 'unknown']
+          or states('sensor.annes_havesensor_soil_battery_3') in ['unavailable', 'unknown']
+          or states('sensor.annes_havesensor_soil_battery_4') in ['unavailable', 'unknown']
           or states('sensor.annes_havesensor_soil_battery_1') | float(9) < 1.2
           or states('sensor.annes_havesensor_soil_battery_2') | float(9) < 1.2
           or states('sensor.annes_havesensor_soil_battery_3') | float(9) < 1.2
@@ -194,10 +194,10 @@
             1 if is_state('binary_sensor.dethlefsen_drive_2_below_min_remaining_life', 'on') else 0,
             1 if is_state('binary_sensor.dethlefsen_drive_3_below_min_remaining_life', 'on') else 0,
             1 if is_state('binary_sensor.dethlefsen_drive_4_below_min_remaining_life', 'on') else 0,
-            1 if states('sensor.annes_havesensor_soil_moisture_1') in ['unavailable', 'unknown'] else 0,
-            1 if states('sensor.annes_havesensor_soil_moisture_2') in ['unavailable', 'unknown'] else 0,
-            1 if states('sensor.annes_havesensor_soil_moisture_3') in ['unavailable', 'unknown'] else 0,
-            1 if states('sensor.annes_havesensor_soil_moisture_4') in ['unavailable', 'unknown'] else 0,
+            1 if states('sensor.annes_havesensor_soil_battery_1') in ['unavailable', 'unknown'] else 0,
+            1 if states('sensor.annes_havesensor_soil_battery_2') in ['unavailable', 'unknown'] else 0,
+            1 if states('sensor.annes_havesensor_soil_battery_3') in ['unavailable', 'unknown'] else 0,
+            1 if states('sensor.annes_havesensor_soil_battery_4') in ['unavailable', 'unknown'] else 0,
             1 if states('sensor.annes_havesensor_soil_battery_1') | float(9) < 1.2 else 0,
             1 if states('sensor.annes_havesensor_soil_battery_2') | float(9) < 1.2 else 0,
             1 if states('sensor.annes_havesensor_soil_battery_3') | float(9) < 1.2 else 0,