diff --git a/configuration.yaml b/configuration.yaml
index 118b221..b896641 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -88,6 +88,7 @@ recorder:
       - sensor.*birthday
       - sensor.*anniversary
       - sensor.*uptime*
+      - binary_sensor.*uptime*
       - sensor.*power
       - sensor.*energy*
       - sensor.*energy_sensor*
@@ -215,8 +216,7 @@ influxdb:
       - binary_sensor.*desktop_on
       - binary_sensor.*server_on
       - sensor.*_steps
-      - sensor.nextcloud*
-      - binary_sensor.nextcloud*
+      - binary_sensor.*uptime*
     entities:
       - media_player.living_room_tv
       - media_player.basement_tv
@@ -345,8 +345,7 @@ prometheus:
       - binary_sensor.*desktop_on
       - binary_sensor.*server_on
       - sensor.*_steps
-      - sensor.nextcloud*
-      - binary_sensor.nextcloud*
+      - binary_sensor.*uptime*
     include_entities:
       - media_player.living_room_tv
       - media_player.basement_tv