Try the group approach

data/configuration.yaml

@@ -30,8 +30,6 @@ devices:
     friendly_name: FF_Landing_Colour_Light_1
   '0x000d6ffffe2667e6':
     friendly_name: FF_Landing_Light_2
-  '0x142d41fffe403706':
-    friendly_name: '0x142d41fffe403706'
   '0x00158d0002b546d7':
     friendly_name: FF_Office_Environment
   '0x90fd9ffffe04dc91':
@@ -89,6 +87,8 @@ devices:
     friendly_name: '0x000b57fffed6ff1f'
   '0x00158d000275355b':
     friendly_name: GF_Living_Environment
+  '0x142d41fffe403706':
+    friendly_name: FF_Office_Control
 groups:
   '1':
     friendly_name: FF_Landing
@@ -96,3 +96,9 @@ groups:
       - 0xd0cf5efffe21666e/1
       - 0x000d6ffffe2667e6/1
       - 0x90fd9ffffef25e70/1
+  '2':
+    friendly_name: FF_Office
+    devices:
+      - 0x90fd9ffffe82e267/1
+      - 0x90fd9ffffe15b9ad/1
+      - 0x000b57fffef3ffd4/1