diff --git a/group.yaml b/group.yaml
index f88c5048..fcd5882f 100644
--- a/group.yaml
+++ b/group.yaml
@@ -148,6 +148,7 @@ view_settings:
   entities:
     - group.standards
     - group.warm_bath_before_wakeup
+    - group.set_thermostat_when_leaving
     - group.small_ventilator
     - group.large_ventilator
     - group.vacuum_apps
@@ -544,6 +545,12 @@ warm_bath_before_wakeup:
    - input_number.warm_bath_before_wakeup
    - input_boolean.warm_bath_before_wakeup
 
+set_thermostat_when_leaving:
+  name: Fußbdodenheizung Wohnzimmer
+  entities:
+   - input_number.set_thermostat_when_leaving
+   - input_boolean.set_thermostat_when_leaving
+
 app_switches:
   name: App Switches
   entities:
@@ -578,6 +585,8 @@ app_switches:
     - input_boolean.notifier_alexa
     - input_boolean.turn_on_bath_thermostat_when_window_closed
     - input_boolean.turn_off_bath_thermostat_when_window_open
+    - input_boolean.set_thermostat_when_leaving
+
 
 notifier_alexa:
   name: Alexa Ansagen
diff --git a/input_boolean.yaml b/input_boolean.yaml
index 0ea02470..f7100b45 100644
--- a/input_boolean.yaml
+++ b/input_boolean.yaml
@@ -112,4 +112,7 @@
     name: Fußbodenheizung im Bad ausschalten wenn Fenster offen
   turn_on_bath_thermostat_when_window_closed:
     icon: mdi:window-closed
-    name: Fußbodenheizung im Bad anschalten wenn Fenster zu
\ No newline at end of file
+    name: Fußbodenheizung im Bad anschalten wenn Fenster zu
+  set_thermostat_when_leaving:
+    icon: mdi:temperature-celsius
+    name: Fußbodenheizung im Wohnzimmer wenn wir gehen
\ No newline at end of file
diff --git a/input_number.yaml b/input_number.yaml
index bd1198df..47e6705e 100644
--- a/input_number.yaml
+++ b/input_number.yaml
@@ -39,6 +39,12 @@ turn_large_fan_on_when_hot_threshold:
   max: 40
   step: 1
 warm_bath_before_wakeup:
+  name: Temperature
+  icon: mdi:temperature-celsius
+  min: 18
+  max: 30
+  step: 0.5
+set_thermostat_when_leaving:
   name: Temperature
   icon: mdi:temperature-celsius
   min: 18