diff --git a/config/lovelace/advanced_dashboard/10_system.yaml b/config/lovelace/advanced_dashboard/10_system.yaml
index 92eb1f0..7197838 100644
--- a/config/lovelace/advanced_dashboard/10_system.yaml
+++ b/config/lovelace/advanced_dashboard/10_system.yaml
@@ -70,6 +70,8 @@ cards:
               entity: sensor.hallway_weather_battery
             - type: custom:battery-entity-row
               entity: sensor.hallway_motion_battery
+            - type: custom:battery-entity-row
+              entity: sensor.hallway_motion_2_battery
             - type: custom:battery-entity-row
               entity: sensor.bathroom_motion_battery
             - type: custom:battery-entity-row
diff --git a/config/lovelace/floorplan_dashboard/picture_elements/sensors.yaml b/config/lovelace/floorplan_dashboard/picture_elements/sensors.yaml
index 0dc7444..e7645d5 100644
--- a/config/lovelace/floorplan_dashboard/picture_elements/sensors.yaml
+++ b/config/lovelace/floorplan_dashboard/picture_elements/sensors.yaml
@@ -208,7 +208,7 @@
     - type: custom:decluttering-card
       template: floorplan_state_icon
       variables:
-        - entity: binary_sensor.hallway_motion_occupancy
+        - entity: group.hallway_motion
         - top: 34%
         - left: 54%
         - tap_action:
diff --git a/config/lovelace/home_dashboard/hallway_dashboard.yaml b/config/lovelace/home_dashboard/hallway_dashboard.yaml
index 2d48783..c4305ee 100644
--- a/config/lovelace/home_dashboard/hallway_dashboard.yaml
+++ b/config/lovelace/home_dashboard/hallway_dashboard.yaml
@@ -28,7 +28,7 @@
                 name: Front door
               - type: custom:button-card
                 template: v3_chip_name
-                entity: binary_sensor.hallway_motion_occupancy
+                entity: group.hallway_motion
                 name: Motion
 
 
diff --git a/config/packages/modules/batteries.yaml b/config/packages/modules/batteries.yaml
index 013a076..c489a45 100644
--- a/config/packages/modules/batteries.yaml
+++ b/config/packages/modules/batteries.yaml
@@ -30,6 +30,7 @@ automation:
 
         - sensor.hallway_weather_battery
         - sensor.hallway_motion_battery
+        - sensor.hallway_motion_2_battery
 
         - sensor.guest_bedroom_weather_battery
         - sensor.terrarium_weather_battery
diff --git a/config/packages/modules/network.yaml b/config/packages/modules/network.yaml
index 92d170e..cd1ae2a 100644
--- a/config/packages/modules/network.yaml
+++ b/config/packages/modules/network.yaml
@@ -74,6 +74,7 @@ homekit:
       - light.hallway_entrance
       - light.hallway_main
       - binary_sensor.hallway_motion_occupancy
+      - binary_sensor.hallway_motion_2_occupancy
       - group.hallway_motion
       - sensor.hallway_weather_temperature
       - sensor.hallway_weather_humidity
diff --git a/config/packages/sensors/motion.yaml b/config/packages/sensors/motion.yaml
index 85d69f0..cbcd71a 100644
--- a/config/packages/sensors/motion.yaml
+++ b/config/packages/sensors/motion.yaml
@@ -3,6 +3,7 @@ group:
     name: All motion_sensors
     entities:
       - binary_sensor.hallway_motion_occupancy
+      - binary_sensor.hallway_motion_2_occupancy
       - binary_sensor.bathroom_motion_occupancy
       - binary_sensor.kitchen_motion_occupancy
       - binary_sensor.multisensor_motion
@@ -11,3 +12,4 @@ group:
     name: Hallway Motion
     entities:
       - binary_sensor.hallway_motion_occupancy
+      - binary_sensor.hallway_motion_2_occupancy
diff --git a/zigbee2mqtt_deconz/data/configuration.yaml b/zigbee2mqtt_deconz/data/configuration.yaml
index 4fa2cd4..486062a 100644
--- a/zigbee2mqtt_deconz/data/configuration.yaml
+++ b/zigbee2mqtt_deconz/data/configuration.yaml
@@ -170,6 +170,8 @@ devices:
     friendly_name: '0x086bd7fffe075b7d'
   '0x54ef441000818477':
     friendly_name: bathroom_wall_switch
+  '0x54ef4410008381ee':
+    friendly_name: hallway_motion_2
 groups:
   '1':
     friendly_name: kitchen_main