diff --git a/group.yaml b/group.yaml
index d510336c..c4d46430 100644
--- a/group.yaml
+++ b/group.yaml
@@ -151,6 +151,7 @@ view_settings:
     - group.standards
     - group.warm_bath_before_wakeup
     - group.set_thermostat_when_leaving
+    - group.set_thermostat_when_sleeping
     - group.small_ventilator
     - group.large_ventilator
     - group.vacuum_apps
@@ -555,11 +556,17 @@ warm_bath_before_wakeup:
    - input_boolean.warm_bath_before_wakeup
 
 set_thermostat_when_leaving:
-  name: Fußbdodenheizung Wohnzimmer
+  name: Fußbdodenheizung Wohnzimmer Weg
   entities:
    - input_number.set_thermostat_when_leaving
    - input_boolean.set_thermostat_when_leaving
 
+set_thermostat_when_sleeping:
+  name: Fußbdodenheizung Wohnzimmer Nachts
+  entities:
+   - input_number.set_thermostat_when_sleeping
+   - input_boolean.set_thermostat_when_sleeping
+
 app_switches:
   name: App Switches
   entities:
@@ -595,6 +602,7 @@ app_switches:
     - input_boolean.turn_on_bath_thermostat_when_window_closed
     - input_boolean.turn_off_bath_thermostat_when_window_open
     - input_boolean.set_thermostat_when_leaving
+    - input_boolean.set_thermostat_when_sleeping
     - input_boolean.travel_time_home_user_one_update
     - input_boolean.travel_time_home_user_two_update
     - input_boolean.increase_counter_on_google_maps_update
diff --git a/input_boolean.yaml b/input_boolean.yaml
index 500117d4..a341f1d1 100644
--- a/input_boolean.yaml
+++ b/input_boolean.yaml
@@ -116,6 +116,9 @@
   set_thermostat_when_leaving:
     icon: mdi:temperature-celsius
     name: Fußbodenheizung im Wohnzimmer wenn wir gehen
+  set_thermostat_when_sleeping:
+    icon: mdi:temperature-celsius
+    name: Fußbodenheizung im Wohnzimmer wenn wir schlafen
   travel_time_home_user_one_update:
     icon: mdi:update
     name: Update Travel Time Home User One
diff --git a/input_number.yaml b/input_number.yaml
index 3d97bac3..c026ffa4 100644
--- a/input_number.yaml
+++ b/input_number.yaml
@@ -50,6 +50,12 @@ set_thermostat_when_leaving:
   min: 18
   max: 30
   step: 0.5
+set_thermostat_when_sleeping:
+  name: Temperature
+  icon: mdi:temperature-celsius
+  min: 18
+  max: 30
+  step: 0.5
 travel_time_home_user_one_update_interval:
   min: 2
   max: 2678400 # 1 month