diff --git a/dashboards/cards/batteries.yaml b/dashboards/cards/batteries.yaml
index db934e0e..659cf1e3 100644
--- a/dashboards/cards/batteries.yaml
+++ b/dashboards/cards/batteries.yaml
@@ -28,7 +28,7 @@ entities:
       filter:
         template: >
           {% set rows = namespace(low = [], others = []) %}
-          {%- for entity in expand('group.all_batteries') %}
+          {%- for entity in expand('sensor.all_batteries') %}
             {% set level = entity.state | int(None) %}
             {% set battery_type = entity.attributes.battery_type | default %}
             {% set warning_level = entity.attributes.battery_warning_level | default | int(25) %}
@@ -63,7 +63,7 @@ entities:
     filter:
       template: >
         {% set rows = namespace(low = [], others = []) %}
-        {%- for entity in expand('group.all_batteries') %}
+        {%- for entity in expand('sensor.all_batteries') %}
           {% set level = entity.state | int(None) %}
           {% set battery_type = entity.attributes.battery_type | default %}
           {% set warning_level = entity.attributes.battery_warning_level | default | int(25) %}
diff --git a/packages/aggregates/batteries.yaml b/packages/aggregates/batteries.yaml
index c3375b99..74538f3e 100644
--- a/packages/aggregates/batteries.yaml
+++ b/packages/aggregates/batteries.yaml
@@ -46,7 +46,7 @@ template:
           entity_id: >-
             {% set ns = namespace(entities = []) %}
 
-            {% for entity in expand('group.all_batteries') %}
+            {% for entity in expand('sensor.all_batteries') %}
               {% set state = entity.state | int(0) %}
               {% set warning_level = state_attr(entity.entity_id, 'battery_warning_level') | int(25) %}
               {% if state <= warning_level %}