diff --git a/Maintenance/maint-reboot-required.yaml b/Maintenance/maint-reboot-required.yaml
index d1df49a..efef12b 100644
--- a/Maintenance/maint-reboot-required.yaml
+++ b/Maintenance/maint-reboot-required.yaml
@@ -21,12 +21,12 @@
     
     - name: Get list of rebooted servers
       set_fact:
-        rebooted_servers: "{{ ansible_play_hosts | select('in', reboot) }}"
+        rebooted_servers: "{{ groups['all'] | intersect([host for host, result in reboot.items() if result.stat.exists]) }}"
 
     - name: Debug rebooted servers
       debug:
         var: rebooted_servers
-        
+
     - name: Send Teams notification
       run_once: true
       uri: