diff --git a/configs/pepe/home-assistant.nix b/configs/pepe/home-assistant.nix
index 5e00aaf..7548692 100644
--- a/configs/pepe/home-assistant.nix
+++ b/configs/pepe/home-assistant.nix
@@ -116,6 +116,7 @@ in {
               entity_id = "group.${presentsGroup}";
               from = "on";
               to = "off";
+              for.seconds = 2 * 60;
             };
             condition = {
               condition = "and";
diff --git a/configs/pepe/home-assistant/sonoff.nix b/configs/pepe/home-assistant/sonoff.nix
index e6666bf..2048f7d 100644
--- a/configs/pepe/home-assistant/sonoff.nix
+++ b/configs/pepe/home-assistant/sonoff.nix
@@ -8,9 +8,8 @@ let
       groups = [ "all_lights" "bed_room_lights" "bed_room" ];
     };
     "pal02" = {
-      label = "Wohnzimmer Lampe";
+      label = "Nummer 2";
       icon = "mdi:lightbulb";
-      groups = [ ];
     };
     "pal03" = {
       label = "Wohnzimmer Lampe";
diff --git a/configs/pepe/home-assistant/zigbee2mqtt/motion.nix b/configs/pepe/home-assistant/zigbee2mqtt/motion.nix
index 3a84d16..f519849 100644
--- a/configs/pepe/home-assistant/zigbee2mqtt/motion.nix
+++ b/configs/pepe/home-assistant/zigbee2mqtt/motion.nix
@@ -7,49 +7,41 @@ let
     "motion_sensor_1" = {
       id = "0x00158d0002fbd451";
       groups = [ "kitchen_room" "kitchen_room_present" ];
-      timeout = 60 * 2;
     };
     "motion_sensor_2" = {
       id = "0x00158d0002f9a6b8";
       groups = [ "kitchen_room" "kitchen_room_present" ];
-      timeout = 60 * 2;
     };
     "motion_sensor_3" = {
       id = "0x00158d0002f04522";
       groups = [ "living_room" "living_room_present" ];
-      timeout = 60 * 3;
     };
     "motion_sensor_4" = {
       id = "0x00158d0002f9a558";
       groups = [ "living_room" "living_room_present" ];
-      timeout = 60 * 3;
     };
     "motion_sensor_5" = {
       id = "0x00158d0002f9a56f";
       groups = [ "bath_room" "bath_room_present" ];
-      timeout = 60 * 3;
     };
     "motion_sensor_6" = {
       id = "0x00158d0002f9a5cb";
       groups = [ "floor_room" "floor_room_present" ];
-      timeout = 60 * 2;
     };
     "motion_sensor_7" = {
       id = "0x00158d0002f9a6aa";
       groups = [ "bed_room" "bed_room_present" ];
-      timeout = 60 * 1.2;
     };
     "motion_sensor_8" = {
       id = "0x00158d0002f04637";
       groups = [ "bath_room" "bath_room_present" ];
-      timeout = 60 * 3;
     };
   };
 
 in {
 
   services.zigbee2mqtt.devices = lib.mapAttrs' (name:
-    { id, timeout ? 90, ... }: {
+    { id, timeout ? 65, ... }: {
       name = id;
       value = {
         retain = false;