diff --git a/configuration/devices/headless/server/home-assistant/hue.nix b/configuration/devices/headless/server/home-assistant/hue.nix
index 6bbe3f6b..087748a3 100644
--- a/configuration/devices/headless/server/home-assistant/hue.nix
+++ b/configuration/devices/headless/server/home-assistant/hue.nix
@@ -204,17 +204,12 @@ in {
     }
     {
       name = "entrance";
-      targetId = "light.group_entrance";
+      targetId = "light.group_switch_entrance";
       switch = switches.entrance;
     }
     {
-      name = "kitchen";
-      targetId = "light.group_kitchen";
-      switch = switches.livingRoom;
-    }
-    {
-      name = "living room";
-      targetId = "light.group_living_room";
+      name = "kitchen and living room";
+      targetId = "light.group_switch_living_room";
       switch = switches.livingRoom;
     }
   ]);
diff --git a/configuration/devices/headless/server/home-assistant/lights.nix b/configuration/devices/headless/server/home-assistant/lights.nix
index 785916dd..c501048d 100644
--- a/configuration/devices/headless/server/home-assistant/lights.nix
+++ b/configuration/devices/headless/server/home-assistant/lights.nix
@@ -29,12 +29,38 @@
     {
       platform = "group";
       name = "Group Living room";
-      entities = [ "light.living_room_signe_gradient_kitchen" "light.living_room_signe_gradient_window" "light.living_room_standing_lamp" ];
+      entities = [
+        "light.living_room_signe_gradient_kitchen"
+        "light.living_room_signe_gradient_window"
+        "light.living_room_standing_lamp"
+        "light.living_room_table_lamp"
+      ];
     }
     {
       platform = "group";
       name = "Group Reduit";
       entities = [ "light.reduit_closet_lights" ];
     }
+
+    {
+      platform = "group";
+      name = "Group switch bedroom";
+      entities = [ "light.bedroom_standing_lamp" ];
+    }
+    {
+      platform = "group";
+      name = "Group switch entrance";
+      entities = [ "light.entrance_lamp" "light.entrance_sideboard_lamp" ];
+    }
+    {
+      platform = "group";
+      name = "Group switch living room";
+      entities = [
+        "light.kitchen_standing_lamp"
+        "light.living_room_signe_gradient_kitchen"
+        "light.living_room_standing_lamp"
+        "light.living_room_table_lamp"
+      ];
+    }
   ];
 }