diff --git a/ansible/services/forgejo/forgejo_vars.yml b/ansible/services/forgejo/forgejo_vars.yml
index 0bbb5a5..2a24133 100644
--- a/ansible/services/forgejo/forgejo_vars.yml
+++ b/ansible/services/forgejo/forgejo_vars.yml
@@ -12,7 +12,7 @@ forgejo_user: "git"
 # (caddy_sites_dir and subdomain now in services_config.yml)
 
 # Remote access
-remote_host_name: "vipy"
+remote_host_name: "{{ groups['edge'] | first }}"
 remote_host: "{{ hostvars.get(remote_host_name, {}).get('ansible_host', remote_host_name) }}"
 remote_user: "{{ hostvars.get(remote_host_name, {}).get('ansible_user', 'counterweight') }}"
 remote_key_file: "{{ hostvars.get(remote_host_name, {}).get('ansible_ssh_private_key_file', '') }}"
diff --git a/ansible/services/headscale/headscale_vars.yml b/ansible/services/headscale/headscale_vars.yml
index 653c175..0b0ee50 100644
--- a/ansible/services/headscale/headscale_vars.yml
+++ b/ansible/services/headscale/headscale_vars.yml
@@ -13,7 +13,7 @@ headscale_data_dir: /var/lib/headscale
 # Namespace now configured in services_config.yml under service_settings.headscale.namespace
 
 # Remote access
-remote_host_name: "spacey"
+remote_host_name: "{{ groups['vpn_control'] | first }}"
 remote_host: "{{ hostvars.get(remote_host_name, {}).get('ansible_host', remote_host_name) }}"
 remote_user: "{{ hostvars.get(remote_host_name, {}).get('ansible_user', 'counterweight') }}"
 remote_key_file: "{{ hostvars.get(remote_host_name, {}).get('ansible_ssh_private_key_file', '') }}"
diff --git a/ansible/services/lnbits/lnbits_vars.yml b/ansible/services/lnbits/lnbits_vars.yml
index bdb97df..eabd6fc 100644
--- a/ansible/services/lnbits/lnbits_vars.yml
+++ b/ansible/services/lnbits/lnbits_vars.yml
@@ -6,7 +6,7 @@ lnbits_port: 8765
 # (caddy_sites_dir and subdomain now in services_config.yml)
 
 # Remote access
-remote_host_name: "vipy"
+remote_host_name: "{{ groups['edge'] | first }}"
 remote_host: "{{ hostvars.get(remote_host_name, {}).get('ansible_host', remote_host_name) }}"
 remote_user: "{{ hostvars.get(remote_host_name, {}).get('ansible_user', 'counterweight') }}"
 remote_key_file: "{{ hostvars.get(remote_host_name, {}).get('ansible_ssh_private_key_file', '') }}"
diff --git a/ansible/services/ntfy-emergency-app/ntfy_emergency_app_vars.yml b/ansible/services/ntfy-emergency-app/ntfy_emergency_app_vars.yml
index 415bc4d..a3bb480 100644
--- a/ansible/services/ntfy-emergency-app/ntfy_emergency_app_vars.yml
+++ b/ansible/services/ntfy-emergency-app/ntfy_emergency_app_vars.yml
@@ -9,7 +9,7 @@ ntfy_emergency_app_topic: "emergencia"
 ntfy_emergency_app_ui_message: "Leave Pablo a message, he will respond as soon as possible"
 
 # Remote access
-remote_host_name: "vipy"
+remote_host_name: "{{ groups['edge'] | first }}"
 remote_host: "{{ hostvars.get(remote_host_name, {}).get('ansible_host', remote_host_name) }}"
 remote_user: "{{ hostvars.get(remote_host_name, {}).get('ansible_user', 'counterweight') }}"
 remote_key_file: "{{ hostvars.get(remote_host_name, {}).get('ansible_ssh_private_key_file', '') }}"
diff --git a/ansible/services/personal-blog/personal_blog_vars.yml b/ansible/services/personal-blog/personal_blog_vars.yml
index 59e0921..a1f34e3 100644
--- a/ansible/services/personal-blog/personal_blog_vars.yml
+++ b/ansible/services/personal-blog/personal_blog_vars.yml
@@ -4,7 +4,7 @@
 personal_blog_web_root: "/var/www/pablohere.contrapeso.xyz"
 
 # Remote access for deployment
-remote_host_name: "vipy"
+remote_host_name: "{{ groups['edge'] | first }}"
 remote_host: "{{ hostvars.get(remote_host_name, {}).get('ansible_host', remote_host_name) }}"
 remote_user: "{{ hostvars.get(remote_host_name, {}).get('ansible_user', 'counterweight') }}"
 remote_key_file: "{{ hostvars.get(remote_host_name, {}).get('ansible_ssh_private_key_file', '') }}"
diff --git a/ansible/services/phoenixd/phoenixd_vars.yml b/ansible/services/phoenixd/phoenixd_vars.yml
index 57218dc..f67c302 100644
--- a/ansible/services/phoenixd/phoenixd_vars.yml
+++ b/ansible/services/phoenixd/phoenixd_vars.yml
@@ -41,7 +41,7 @@ phoenixd_healthcheck_service_name: phoenixd-healthcheck
 phoenixd_monitor_name: "Phoenixd"
 
 # Remote access
-remote_host_name: "vipy"
+remote_host_name: "{{ groups['edge'] | first }}"
 remote_host: "{{ hostvars.get(remote_host_name, {}).get('ansible_host', remote_host_name) }}"
 remote_user: "{{ hostvars.get(remote_host_name, {}).get('ansible_user', 'counterweight') }}"
 remote_key_file: "{{ hostvars.get(remote_host_name, {}).get('ansible_ssh_private_key_file', '') }}"
diff --git a/ansible/services/uptime_kuma/uptime_kuma_vars.yml b/ansible/services/uptime_kuma/uptime_kuma_vars.yml
index 3263f49..33ffb6d 100644
--- a/ansible/services/uptime_kuma/uptime_kuma_vars.yml
+++ b/ansible/services/uptime_kuma/uptime_kuma_vars.yml
@@ -4,7 +4,7 @@ uptime_kuma_data_dir: "{{ uptime_kuma_dir }}/data"
 uptime_kuma_port: 3001
 
 # Remote access
-remote_host_name: "watchtower"
+remote_host_name: "{{ groups['monitoring'] | first }}"
 remote_host: "{{ hostvars.get(remote_host_name, {}).get('ansible_host', remote_host_name) }}"
 remote_user: "{{ hostvars.get(remote_host_name, {}).get('ansible_user', 'counterweight') }}"
 remote_key_file: "{{ hostvars.get(remote_host_name, {}).get('ansible_ssh_private_key_file', '') }}"
diff --git a/ansible/services/vaultwarden/vaultwarden_vars.yml b/ansible/services/vaultwarden/vaultwarden_vars.yml
index 75e527d..e60f1d4 100644
--- a/ansible/services/vaultwarden/vaultwarden_vars.yml
+++ b/ansible/services/vaultwarden/vaultwarden_vars.yml
@@ -6,7 +6,7 @@ vaultwarden_port: 8222
 # (caddy_sites_dir and subdomain now in services_config.yml)
 
 # Remote access
-remote_host_name: "vipy"
+remote_host_name: "{{ groups['edge'] | first }}"
 remote_host: "{{ hostvars.get(remote_host_name, {}).get('ansible_host', remote_host_name) }}"
 remote_user: "{{ hostvars.get(remote_host_name, {}).get('ansible_user', 'counterweight') }}"
 remote_key_file: "{{ hostvars.get(remote_host_name, {}).get('ansible_ssh_private_key_file', '') }}"