diff --git a/configuration.yaml b/configuration.yaml
index 5d4fb5d..3524f57 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -118,13 +118,70 @@ influxdb:
       - zone
       - persistent_notification
       - person
-    entity_globs:
-      - sensor.*battery*
-  include:
-    domains:
+      - media_player
+      - scan_store
       - sensor
       - binary_sensor
+      - weather
+    entity_globs:
+      - binary_sensor.*tamper*
+    entities:
+      - sensor.last_boot
+      - sensor.date
+      - sensor.date_time
+      - sensor.time_date
+      - sensor.time
+      - sensor.time_utc
+      - sensor.xr500_gateway_kib_s_received
+      - sensor.xr500_gateway_kib_s_sent
+  include:
+    domains:
       - sun
+      - light
+      - climate
+      - fan
+    entity_globs:
+      - sensor.*energy_sensor
+      - sensor.*power_sensor
+      - sensor.*cpu*
+      - sensor.*memory*
+      - sensor.*ram_free*
+      - sensor.*ram_used*
+      - sensor.*available_free_space
+      - sensor.*ping
+      - sensor.*free_space*
+      - sensor.*uptime*
+      - sensor.*tv_time*
+      - sensor.*_count
+      - sensor.*pirateweather*
+      - sensor.*temperature*
+      - sensor.*ipad_storage
+      - sensor.*iphone_storage
+      - sensor.*_open
+      - sensor.xr500*
+      - binary_sensor.*motion*
+      - binary_sensor.*door*
+      - binary_sensor.*window*
+    entities:
+      - media_player.living_room_tv
+      - media_player.basement_tv
+      - media_player.master_bedroom_firetv
+      - sensor.doors_open
+      - sensor.windows_open
+      - sensor.total_faults
+      - sensor.blitzortung_lightning_counter
+      - sensor.lines_of_code
+      - sensor.mariadb_database_size
+      - sensor.outside_absolutehumidity
+      - sensor.outside_lights
+      - sensor.temperature_change_per_hour
+      - sensor.tina_home
+      - sensor.tony_home
+      - sensor.tm24fan8_home_assistant_configs_issues
+      - binary_sensor.internet
+      - binary_sensor.people_present
+      - binary_sensor.precipitation
+      - weather.iron_nerd_weather_station
 
 history:
   exclude: