diff --git a/roles/vhosts/acp_server_codex/handlers/main.yml b/roles/vhosts/acp_server_codex/handlers/main.yml
index b1a28e2..b52ce80 100644
--- a/roles/vhosts/acp_server_codex/handlers/main.yml
+++ b/roles/vhosts/acp_server_codex/handlers/main.yml
@@ -3,13 +3,14 @@
   ansible.builtin.service:
     name: caddy
     state: reloaded
-  when: ansible_os_family != 'Darwin'
+  when: ansible_system == 'Linux'
 
-- name: Restart acp codex
+- name: Restart acp codex on Linux
   ansible.builtin.service:
     name: "{{ acp_codex_service_name }}"
     state: restarted
-  when: ansible_os_family != 'Darwin'
+  when: ansible_system == 'Linux'
+  listen: Restart acp codex
 
 - name: Restart acp codex on macOS
   ansible.builtin.command: "launchctl unload {{ ansible_env.HOME }}/Library/LaunchAgents/plus.svc.xworkspace.acp.codex.plist"
@@ -17,7 +18,16 @@
   failed_when: false
   changed_when: false
   notify: Start acp codex on macOS
+  when: ansible_system == 'Darwin'
+  listen: Restart acp codex
 
 - name: Start acp codex on macOS
   ansible.builtin.command: "launchctl load -w {{ ansible_env.HOME }}/Library/LaunchAgents/plus.svc.xworkspace.acp.codex.plist"
   changed_when: false
+  when: ansible_system == 'Darwin'
+
+- name: Restart acp codex on Windows
+  ansible.builtin.debug:
+    msg: "Windows restart for codex is not yet implemented"
+  when: ansible_os_family == 'Windows'
+  listen: Restart acp codex
diff --git a/roles/vhosts/acp_server_codex/tasks/macos.yml b/roles/vhosts/acp_server_codex/tasks/macos.yml
index d14653e..4e6a5c5 100644
--- a/roles/vhosts/acp_server_codex/tasks/macos.yml
+++ b/roles/vhosts/acp_server_codex/tasks/macos.yml
@@ -4,7 +4,7 @@
     src: codex.plist.j2
     dest: "{{ ansible_env.HOME }}/Library/LaunchAgents/plus.svc.xworkspace.acp.codex.plist"
     mode: "0644"
-  notify: Restart acp codex on macOS
+  notify: Restart acp codex
 
 - name: Reload launchd agent for Codex ACP
   ansible.builtin.command: "launchctl load -w {{ ansible_env.HOME }}/Library/LaunchAgents/plus.svc.xworkspace.acp.codex.plist"
diff --git a/roles/vhosts/acp_server_gemini/handlers/main.yml b/roles/vhosts/acp_server_gemini/handlers/main.yml
index c4e59e8..484666c 100644
--- a/roles/vhosts/acp_server_gemini/handlers/main.yml
+++ b/roles/vhosts/acp_server_gemini/handlers/main.yml
@@ -3,13 +3,14 @@
   ansible.builtin.service:
     name: caddy
     state: reloaded
-  when: ansible_os_family != 'Darwin'
+  when: ansible_system == 'Linux'
 
-- name: Restart acp gemini
+- name: Restart acp gemini on Linux
   ansible.builtin.service:
     name: "{{ acp_gemini_service_name }}"
     state: restarted
-  when: ansible_os_family != 'Darwin'
+  when: ansible_system == 'Linux'
+  listen: Restart acp gemini
 
 - name: Restart acp gemini on macOS
   ansible.builtin.command: "launchctl unload {{ ansible_env.HOME }}/Library/LaunchAgents/plus.svc.xworkspace.acp.gemini.plist"
@@ -17,7 +18,16 @@
   failed_when: false
   changed_when: false
   notify: Start acp gemini on macOS
+  when: ansible_system == 'Darwin'
+  listen: Restart acp gemini
 
 - name: Start acp gemini on macOS
   ansible.builtin.command: "launchctl load -w {{ ansible_env.HOME }}/Library/LaunchAgents/plus.svc.xworkspace.acp.gemini.plist"
   changed_when: false
+  when: ansible_system == 'Darwin'
+
+- name: Restart acp gemini on Windows
+  ansible.builtin.debug:
+    msg: "Windows restart for gemini is not yet implemented"
+  when: ansible_os_family == 'Windows'
+  listen: Restart acp gemini
diff --git a/roles/vhosts/acp_server_gemini/tasks/macos.yml b/roles/vhosts/acp_server_gemini/tasks/macos.yml
index 22e13f7..8b89c34 100644
--- a/roles/vhosts/acp_server_gemini/tasks/macos.yml
+++ b/roles/vhosts/acp_server_gemini/tasks/macos.yml
@@ -4,7 +4,7 @@
     src: gemini.plist.j2
     dest: "{{ ansible_env.HOME }}/Library/LaunchAgents/plus.svc.xworkspace.acp.gemini.plist"
     mode: "0644"
-  notify: Restart acp gemini on macOS
+  notify: Restart acp gemini
 
 - name: Reload launchd agent for Gemini ACP
   ansible.builtin.command: "launchctl load -w {{ ansible_env.HOME }}/Library/LaunchAgents/plus.svc.xworkspace.acp.gemini.plist"
diff --git a/roles/vhosts/acp_server_hermes/handlers/main.yml b/roles/vhosts/acp_server_hermes/handlers/main.yml
index 34db497..16fdd33 100644
--- a/roles/vhosts/acp_server_hermes/handlers/main.yml
+++ b/roles/vhosts/acp_server_hermes/handlers/main.yml
@@ -3,13 +3,14 @@
   ansible.builtin.service:
     name: caddy
     state: reloaded
-  when: ansible_os_family != 'Darwin'
+  when: ansible_system == 'Linux'
 
-- name: Restart acp hermes
+- name: Restart acp hermes on Linux
   ansible.builtin.service:
     name: "{{ acp_hermes_service_name }}"
     state: restarted
-  when: ansible_os_family != 'Darwin'
+  when: ansible_system == 'Linux'
+  listen: Restart acp hermes
 
 - name: Restart acp hermes on macOS
   ansible.builtin.command: "launchctl unload {{ ansible_env.HOME }}/Library/LaunchAgents/plus.svc.xworkspace.acp.hermes.plist"
@@ -17,7 +18,16 @@
   failed_when: false
   changed_when: false
   notify: Start acp hermes on macOS
+  when: ansible_system == 'Darwin'
+  listen: Restart acp hermes
 
 - name: Start acp hermes on macOS
   ansible.builtin.command: "launchctl load -w {{ ansible_env.HOME }}/Library/LaunchAgents/plus.svc.xworkspace.acp.hermes.plist"
   changed_when: false
+  when: ansible_system == 'Darwin'
+
+- name: Restart acp hermes on Windows
+  ansible.builtin.debug:
+    msg: "Windows restart for hermes is not yet implemented"
+  when: ansible_os_family == 'Windows'
+  listen: Restart acp hermes
diff --git a/roles/vhosts/acp_server_hermes/tasks/macos.yml b/roles/vhosts/acp_server_hermes/tasks/macos.yml
index 7cb5b25..be80c41 100644
--- a/roles/vhosts/acp_server_hermes/tasks/macos.yml
+++ b/roles/vhosts/acp_server_hermes/tasks/macos.yml
@@ -4,7 +4,7 @@
     src: hermes.plist.j2
     dest: "{{ ansible_env.HOME }}/Library/LaunchAgents/plus.svc.xworkspace.acp.hermes.plist"
     mode: "0644"
-  notify: Restart acp hermes on macOS
+  notify: Restart acp hermes
 
 - name: Reload launchd agent for Hermes ACP
   ansible.builtin.command: "launchctl load -w {{ ansible_env.HOME }}/Library/LaunchAgents/plus.svc.xworkspace.acp.hermes.plist"
diff --git a/roles/vhosts/acp_server_opencode/handlers/main.yml b/roles/vhosts/acp_server_opencode/handlers/main.yml
index 81b281b..9dfb6fa 100644
--- a/roles/vhosts/acp_server_opencode/handlers/main.yml
+++ b/roles/vhosts/acp_server_opencode/handlers/main.yml
@@ -3,13 +3,14 @@
   ansible.builtin.service:
     name: caddy
     state: reloaded
-  when: ansible_os_family != 'Darwin'
+  when: ansible_system == 'Linux'
 
-- name: Restart acp opencode
+- name: Restart acp opencode on Linux
   ansible.builtin.service:
     name: "{{ acp_opencode_service_name }}"
     state: restarted
-  when: ansible_os_family != 'Darwin'
+  when: ansible_system == 'Linux'
+  listen: Restart acp opencode
 
 - name: Restart acp opencode on macOS
   ansible.builtin.command: "launchctl unload {{ ansible_env.HOME }}/Library/LaunchAgents/plus.svc.xworkspace.acp.opencode.plist"
@@ -17,7 +18,16 @@
   failed_when: false
   changed_when: false
   notify: Start acp opencode on macOS
+  when: ansible_system == 'Darwin'
+  listen: Restart acp opencode
 
 - name: Start acp opencode on macOS
   ansible.builtin.command: "launchctl load -w {{ ansible_env.HOME }}/Library/LaunchAgents/plus.svc.xworkspace.acp.opencode.plist"
   changed_when: false
+  when: ansible_system == 'Darwin'
+
+- name: Restart acp opencode on Windows
+  ansible.builtin.debug:
+    msg: "Windows restart for opencode is not yet implemented"
+  when: ansible_os_family == 'Windows'
+  listen: Restart acp opencode
diff --git a/roles/vhosts/acp_server_opencode/tasks/macos.yml b/roles/vhosts/acp_server_opencode/tasks/macos.yml
index 780a618..b5bd2a1 100644
--- a/roles/vhosts/acp_server_opencode/tasks/macos.yml
+++ b/roles/vhosts/acp_server_opencode/tasks/macos.yml
@@ -4,7 +4,7 @@
     src: opencode.plist.j2
     dest: "{{ ansible_env.HOME }}/Library/LaunchAgents/plus.svc.xworkspace.acp.opencode.plist"
     mode: "0644"
-  notify: Restart acp opencode on macOS
+  notify: Restart acp opencode
 
 - name: Reload launchd agent for OpenCode ACP
   ansible.builtin.command: "launchctl load -w {{ ansible_env.HOME }}/Library/LaunchAgents/plus.svc.xworkspace.acp.opencode.plist"
diff --git a/roles/vhosts/xworkmate_bridge/tasks/main.yml b/roles/vhosts/xworkmate_bridge/tasks/main.yml
index ae688ca..8f9b3dd 100644
--- a/roles/vhosts/xworkmate_bridge/tasks/main.yml
+++ b/roles/vhosts/xworkmate_bridge/tasks/main.yml
@@ -17,6 +17,7 @@
     shell: /bin/bash
     create_home: true
     state: present
+  when: ansible_os_family != 'Darwin'
 
 - name: Ensure xworkmate-bridge base directory exists
   ansible.builtin.file: