diff --git a/inventory/group_vars/galera_all.yml b/inventory/group_vars/galera_all.yml
index 9bb3fd1051..64918f6186 100644
--- a/inventory/group_vars/galera_all.yml
+++ b/inventory/group_vars/galera_all.yml
@@ -32,7 +32,7 @@ galera_disable_privatedevices: "{{ not is_metal }}"
 # the load balancers, and the galera nodes.
 galera_monitoring_allowed_source: >-
   {{
-    groups['galera_all'] | union(groups['haproxy_all'])
+    groups['galera_all'] | union(groups['haproxy'])
       | map('extract', hostvars, 'ansible_host')
       | list
       | join(' ') ~ ' 127.0.0.1'
diff --git a/inventory/group_vars/keystone_all.yml b/inventory/group_vars/keystone_all.yml
index 1056ab415e..d01a0a13ff 100644
--- a/inventory/group_vars/keystone_all.yml
+++ b/inventory/group_vars/keystone_all.yml
@@ -29,7 +29,7 @@ keystone_cache_servers: "{{ memcached_servers.split(',') }}"
 keystone_service_in_ldap: "{{ service_ldap_backend_enabled }}"
 
 # Hosts allowed to override remote IP with X-Forwarded-For
-keystone_set_real_ip_from: "{{ groups['haproxy_all'] | map('extract', hostvars, 'container_address') | list }}"
+keystone_set_real_ip_from: "{{ groups['haproxy'] | map('extract', hostvars, 'container_address') | list }}"
 
 # Ensure that the package state matches the global setting
 keystone_package_state: "{{ package_state }}"
diff --git a/playbooks/healthcheck-hosts.yml b/playbooks/healthcheck-hosts.yml
index 973e286474..686ce52a61 100644
--- a/playbooks/healthcheck-hosts.yml
+++ b/playbooks/healthcheck-hosts.yml
@@ -49,7 +49,7 @@
         dest: /tmp/osa-master-requirements
 
 - name: Ensure settings are not wrong with the usual suspects issues before trying to deploy infra
-  hosts: haproxy_all
+  hosts: haproxy
   gather_facts: yes
   tasks:
     - name: Checking that the LB vips are well configured.
@@ -72,7 +72,7 @@
         - "{{ haproxy_keepalived_external_interface }}"
         - "{{ haproxy_keepalived_internal_interface }}"
       when:
-        - groups['haproxy_all'] | length > 1
+        - groups['haproxy'] | length > 1
 
     - name: Checking that vip address is well formed
       assert:
@@ -83,4 +83,4 @@
         - "{{ haproxy_keepalived_internal_vip_cidr }}"
         - "{{ haproxy_keepalived_external_vip_cidr }}"
       when:
-        - groups['haproxy_all'] | length > 1
+        - groups['haproxy'] | length > 1
diff --git a/playbooks/healthcheck-infrastructure.yml b/playbooks/healthcheck-infrastructure.yml
index 6a0b7d676d..8af61d0e7e 100644
--- a/playbooks/healthcheck-infrastructure.yml
+++ b/playbooks/healthcheck-infrastructure.yml
@@ -18,7 +18,7 @@
 
 # Ensuring Load Balancer behavior
 - name: Ensuring haproxy runs
-  hosts: haproxy_all
+  hosts: haproxy
   gather_facts: no
   tasks:
     - name: Check if host can connect to keepalived ping IP
@@ -28,7 +28,7 @@
     - name: Checking if keepalived is running
       command: "pgrep keepalived"
       changed_when: false
-      when: groups['haproxy_all'] | length > 1
+      when: groups['haproxy'] | length > 1
 
     # Fails if HAProxy is not running
     - name: Recording haproxy stats as a way to ensure haproxy runs