diff --git a/entities/sensors/waste_sensors.yaml b/entities/sensors/waste_sensors.yaml
index 6d39b4b..2bb8162 100644
--- a/entities/sensors/waste_sensors.yaml
+++ b/entities/sensors/waste_sensors.yaml
@@ -59,5 +59,5 @@
 - platform: waste_collection_schedule
   name: waste_all
   count: 4
-  value_template: '{{value.types|join(", ")}}|{{value.daysTo}}|{{value.date.strftime("%d.%m")}}|{{value.date.strftime("%a")}}'  
+  value_template: '{{value.types|join(", ")}}|{{value.daysTo}}|{{value.date.strftime("%d.%m.%Y")}}|{{value.date.strftime("%a")}}'  
   
diff --git a/scenes/attic_homeoffice.yaml b/scenes/attic_homeoffice.yaml
index bda4e72..4b4866d 100644
--- a/scenes/attic_homeoffice.yaml
+++ b/scenes/attic_homeoffice.yaml
@@ -14,9 +14,9 @@ entities:
     state: "off"
   light.kitchenlights:
     state: "off"
+  light.licht_buero_decke:
+    state: "on"
   switch.metered_wall_plug_switch_node4:
     state: "on"
   light.licht_buero_regal:
-    state: "off"
-  light.licht_buero_decke:
-    state: "on"
\ No newline at end of file
+    state: "off"
\ No newline at end of file
diff --git a/scenes/attic_tvtime.yaml b/scenes/attic_tvtime.yaml
index 982d1e5..d03e044 100644
--- a/scenes/attic_tvtime.yaml
+++ b/scenes/attic_tvtime.yaml
@@ -37,9 +37,9 @@ entities:
     state: "off"
   light.kitchenlights:
     state: "off"
+  light.licht_buero_decke:
+    state: "off"
   switch.metered_wall_plug_switch_node4:
     state: "on"
   light.licht_buero_regal:
-    state: "off"
-  light.licht_buero_decke:
     state: "off"
\ No newline at end of file
diff --git a/scripts/good_night.yaml b/scripts/good_night.yaml
index 9e41b91..508bec1 100644
--- a/scripts/good_night.yaml
+++ b/scripts/good_night.yaml
@@ -10,10 +10,18 @@ sequence:
   - service: switch.turn_off
     target:
       entity_id: switch.metered_wall_plug_switch_node4
+  - service: light.turn_off
+    target:
+      entity_id: light.licht_buero_regal
+  - service: light.turn_off
+    target:
+      entity_id: light.licht_buero_decke
+  - service: light.turn_off
+    target:
+      entity_id: light.stricklicht
   - delay:
-      # supports seconds, milliseconds, minutes, hours
-      minutes: 3
+      minutes: 3 # supports seconds, milliseconds, minutes, hours
   - service: scene.turn_on
     target:
       entity_id: scene.schalfenszeit
-mode: single
+mode: single
\ No newline at end of file
diff --git a/scripts/waste_notification.yaml b/scripts/waste_notification.yaml
index acab772..e5445ee 100644
--- a/scripts/waste_notification.yaml
+++ b/scripts/waste_notification.yaml
@@ -24,6 +24,10 @@ variables:
       False
     {% endif %}
 sequence:
+  - service: notify.dev_telegram
+    data:
+      message: >-
+        Müllkalender message required: "{{ action_required }}"
   - condition: template     
     value_template: "{{ action_required }}"
   - service: notify.homegroup_telegram