diff --git a/configuration/automations/brightness.yaml b/configuration/automations/brightness.yaml
index 111ac9a..7734cb2 100644
--- a/configuration/automations/brightness.yaml
+++ b/configuration/automations/brightness.yaml
@@ -13,7 +13,7 @@
     - service: cover.close_cover
       target:
         entity_id:
-          - cover.office_blind
+          - cover.office_blinds
           - cover.dining_blinds
 
 - id: brightness-ok
@@ -32,7 +32,7 @@
     - service: cover.open_cover
       target:
         entity_id:
-          - cover.office_blind
+          - cover.office_blinds
           - cover.dining_blinds
 
 - id: brightness-bright
@@ -50,5 +50,5 @@
     - service: cover.close_cover
       target:
         entity_id:
-          - cover.office_blind
+          - cover.office_blinds
           - cover.dining_blinds
diff --git a/configuration/automations/office-blinds.yaml b/configuration/automations/office-blinds.yaml
index b2f0f85..8edb0d0 100644
--- a/configuration/automations/office-blinds.yaml
+++ b/configuration/automations/office-blinds.yaml
@@ -12,26 +12,26 @@
             - condition: or
               conditions:
                 - condition: state
-                  entity_id: cover.office_blind
+                  entity_id: cover.office_blinds
                   state: 'closing'
                 - condition: state
-                  entity_id: cover.office_blind
+                  entity_id: cover.office_blinds
                   state: 'opening'
           sequence:
             - service: cover.stop_cover
-              entity_id: cover.office_blind
+              entity_id: cover.office_blinds
         - conditions:
           - condition: or
             conditions:
               - condition: state
-                entity_id: cover.office_blind
+                entity_id: cover.office_blinds
                 state: 'closed'
               - condition: state
-                entity_id: cover.office_blind
+                entity_id: cover.office_blinds
                 state: 'open'
           sequence:
             - service: cover.close_cover
-              entity_id: cover.office_blind
+              entity_id: cover.office_blinds
   mode: single
 
 - id: office-blinds-button-down
@@ -48,24 +48,24 @@
             - condition: or
               conditions:
                 - condition: state
-                  entity_id: cover.office_blind
+                  entity_id: cover.office_blinds
                   state: 'closing'
                 - condition: state
-                  entity_id: cover.office_blind
+                  entity_id: cover.office_blinds
                   state: 'opening'
           sequence:
             - service: cover.stop_cover
-              entity_id: cover.office_blind
+              entity_id: cover.office_blinds
         - conditions:
             - condition: or
               conditions:
                 - condition: state
-                  entity_id: cover.office_blind
+                  entity_id: cover.office_blinds
                   state: 'closed'
                 - condition: state
-                  entity_id: cover.office_blind
+                  entity_id: cover.office_blinds
                   state: 'open'
           sequence:
             - service: cover.open_cover
-              entity_id: cover.office_blind
+              entity_id: cover.office_blinds
   mode: single
diff --git a/configuration/configuration.yaml b/configuration/configuration.yaml
index 2da8a03..0871d80 100644
--- a/configuration/configuration.yaml
+++ b/configuration/configuration.yaml
@@ -475,3 +475,8 @@ cover:
       - cover.dining_blind_left
       - cover.dining_blind_middle
       - cover.dining_blind_right
+  - platform: group
+    name: Office Blinds
+    entities:
+      - cover.office_blind_left
+      - cover.office_blind_right
diff --git a/scripts/10.modes.yaml b/scripts/10.modes.yaml
index 93f582a..f6966a4 100644
--- a/scripts/10.modes.yaml
+++ b/scripts/10.modes.yaml
@@ -41,7 +41,7 @@ good_night:
       entity_id:
         - cover.bedroom_blinds
         - cover.dining_blinds
-        - cover.office_blind
+        - cover.office_blinds
     - service: lock.lock
       target:
         entity_id: lock.front_door_25f246fe_door_lock
@@ -68,7 +68,7 @@ good_morning:
       entity_id:
         - cover.bedroom_blinds
         - cover.dining_blinds
-        - cover.office_blind
+        - cover.office_blinds
     - service: alarm_control_panel.alarm_disarm
       entity_id: alarm_control_panel.home_alarm
     - service: input_select.select_option