diff --git a/dashboards/views/11_vedligehold.yaml b/dashboards/views/11_vedligehold.yaml
index bf0afeb..b45e050 100644
--- a/dashboards/views/11_vedligehold.yaml
+++ b/dashboards/views/11_vedligehold.yaml
@@ -13,6 +13,75 @@ sections:
         entity: input_boolean.vis_alle_vedligehold
         name: Vis alle
 
+  - type: grid
+    cards:
+      - type: conditional
+        conditions:
+          - condition: state
+            entity: input_boolean.vis_alle_vedligehold
+            state: "on"
+        card:
+          type: heading
+          heading: Tesla
+
+      - type: conditional
+        conditions:
+          - condition: state
+            entity: input_boolean.vis_alle_vedligehold
+            state: "off"
+          - condition: state
+            entity: binary_sensor.vedligehold_tesla
+            state: "on"
+        card:
+          type: heading
+          heading: Tesla
+
+      - type: conditional
+        conditions:
+          - condition: state
+            entity: input_boolean.vis_alle_vedligehold
+            state: "on"
+        card:
+          type: tile
+          entity: sensor.snowywhite_battery
+          name: Batteri
+
+      - type: conditional
+        conditions:
+          - condition: state
+            entity: input_boolean.vis_alle_vedligehold
+            state: "off"
+          - condition: numeric_state
+            entity: sensor.snowywhite_battery
+            below: 20
+        card:
+          type: tile
+          entity: sensor.snowywhite_battery
+          name: Batteri
+
+      - type: conditional
+        conditions:
+          - condition: state
+            entity: input_boolean.vis_alle_vedligehold
+            state: "on"
+        card:
+          type: tile
+          entity: update.snowywhite_software_update
+          name: Software update
+
+      - type: conditional
+        conditions:
+          - condition: state
+            entity: input_boolean.vis_alle_vedligehold
+            state: "off"
+          - condition: state
+            entity: update.snowywhite_software_update
+            state: "on"
+        card:
+          type: tile
+          entity: update.snowywhite_software_update
+          name: Software update
+
   - type: grid
     cards:
       - type: conditional
diff --git a/include/templates/maintenance.yaml b/include/templates/maintenance.yaml
index 025d0f1..42d48d3 100644
--- a/include/templates/maintenance.yaml
+++ b/include/templates/maintenance.yaml
@@ -1,4 +1,12 @@
 - binary_sensor:
+    - name: Vedligehold Tesla
+      unique_id: maintenance_tesla_needed
+      state: >-
+        {{
+          states('sensor.snowywhite_battery') | float(100) < 20
+          or is_state('update.snowywhite_software_update', 'on')
+        }}
+
     - name: Vedligehold bil
       unique_id: maintenance_car_needed
       state: >-
@@ -170,6 +178,8 @@
             1 if states('sensor.affalddk_norgardsvej_22_restaffald') | float(999) <= 1 else 0,
             1 if states('sensor.affalddk_norgardsvej_22_papir_plast') | float(999) <= 1 else 0,
             1 if states('sensor.affalddk_norgardsvej_22_haveaffald') | float(999) <= 1 else 0,
+            1 if states('sensor.snowywhite_battery') | float(100) < 20 else 0,
+            1 if is_state('update.snowywhite_software_update', 'on') else 0,
             1 if states('sensor.snowywhite_tpms_front_left') | float(99) < 39 else 0,
             1 if states('sensor.snowywhite_tpms_front_right') | float(99) < 39 else 0,
             1 if states('sensor.snowywhite_tpms_rear_left') | float(99) < 39 else 0,