diff --git a/playbooks/common-tasks/os-lxc-container-setup.yml b/playbooks/common-tasks/os-lxc-container-setup.yml
index eb58b9cb56..60cef9ec60 100644
--- a/playbooks/common-tasks/os-lxc-container-setup.yml
+++ b/playbooks/common-tasks/os-lxc-container-setup.yml
@@ -118,7 +118,7 @@
     port: "22"
     delay: "{{ ssh_delay }}"
     search_regex: "OpenSSH"
-    host: "{{ ansible_ssh_host }}"
+    host: "{{ ansible_host }}"
   delegate_to: "{{ physical_host }}"
   register: ssh_wait_check
   until: ssh_wait_check | success
diff --git a/playbooks/inventory/group_vars/all.yml b/playbooks/inventory/group_vars/all.yml
index 026558e0f9..bc9ad89ce9 100644
--- a/playbooks/inventory/group_vars/all.yml
+++ b/playbooks/inventory/group_vars/all.yml
@@ -71,7 +71,7 @@ resolvconf_resolver_group: unbound_all
 
 ## Memcached options
 memcached_port: 11211
-memcached_servers: "{% for host in groups['memcached'] %}{{ hostvars[host]['ansible_ssh_host'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}"
+memcached_servers: "{% for host in groups['memcached'] %}{{ hostvars[host]['ansible_host'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}"
 
 ## Galera
 galera_address: "{{ internal_lb_vip_address }}"
@@ -82,7 +82,7 @@ rabbitmq_host_group: "rabbitmq_all"
 rabbitmq_port: "{{ (rabbitmq_use_ssl | bool) | ternary(5671, 5672) }}"
 
 rabbitmq_use_ssl: True
-rabbitmq_servers: "{% for host in groups[rabbitmq_host_group] %}{{ hostvars[host]['ansible_ssh_host'] }}{% if not loop.last %},{% endif %}{% endfor %}"
+rabbitmq_servers: "{% for host in groups[rabbitmq_host_group] %}{{ hostvars[host]['ansible_host'] }}{% if not loop.last %},{% endif %}{% endfor %}"
 
 ## Enable external SSL handling for general OpenStack services
 openstack_external_ssl: true
diff --git a/playbooks/inventory/group_vars/memcached.yml b/playbooks/inventory/group_vars/memcached.yml
index 052c90be82..80bf5e39b4 100644
--- a/playbooks/inventory/group_vars/memcached.yml
+++ b/playbooks/inventory/group_vars/memcached.yml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-memcached_listen: "{{ ansible_ssh_host }}"
+memcached_listen: "{{ ansible_host }}"
 
 # Ensure that the package state matches the global setting
 memcached_package_state: "{{ package_state }}"
diff --git a/playbooks/lxc-containers-create.yml b/playbooks/lxc-containers-create.yml
index 7531a97528..698cc49033 100644
--- a/playbooks/lxc-containers-create.yml
+++ b/playbooks/lxc-containers-create.yml
@@ -25,7 +25,7 @@
       local_action:
         module: wait_for
         port: "22"
-        host: "{{ ansible_ssh_host | default(inventory_hostname) }}"
+        host: "{{ ansible_host | default(inventory_hostname) }}"
         search_regex: OpenSSH
         delay: 1
   vars:
diff --git a/playbooks/os-cinder-install.yml b/playbooks/os-cinder-install.yml
index 846329bef0..35025466fc 100644
--- a/playbooks/os-cinder-install.yml
+++ b/playbooks/os-cinder-install.yml
@@ -110,7 +110,7 @@
         - always
     - name: Set cinder storage bridge (is_metal no storage network)
       set_fact:
-        storage_address: "{{ ansible_ssh_host }}"
+        storage_address: "{{ ansible_host }}"
       when:
         - hostvars[inventory_hostname]['container_networks']['storage_address']['bridge'] is undefined
         - is_metal | bool
@@ -126,7 +126,7 @@
         - always
     - name: Set cinder storage address (container no storage network)
       set_fact:
-        storage_address: "{{ ansible_ssh_host }}"
+        storage_address: "{{ ansible_host }}"
       when:
         - hostvars[inventory_hostname]['container_networks']['storage_address']['address'] is undefined
         - not is_metal | bool
@@ -136,7 +136,7 @@
     - role: "os_cinder"
       cinder_venv_tag: "{{ openstack_release }}"
       cinder_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/cinder-{{ openstack_release }}-{{ ansible_architecture | lower }}.tgz"
-      cinder_management_address: "{{ ansible_ssh_host }}"
+      cinder_management_address: "{{ ansible_host }}"
       cinder_storage_address: "{{ storage_address }}"
       cinder_glance_host: "{{ internal_lb_vip_address }}"
       cinder_glance_service_port: "{{ glance_service_port }}"
diff --git a/playbooks/os-neutron-install.yml b/playbooks/os-neutron-install.yml
index 4dfc3dab58..925b4691cb 100644
--- a/playbooks/os-neutron-install.yml
+++ b/playbooks/os-neutron-install.yml
@@ -100,14 +100,14 @@
         - always
     - name: set local_ip fact (is_metal)
       set_fact:
-        _local_ip: "{{ hostvars[inventory_hostname]['ansible_' + _overlay_network.bridge|default(ansible_default_ipv4['interface'])|replace('-', '_')]['ipv4']['address']|default(ansible_ssh_host) }}"
+        _local_ip: "{{ hostvars[inventory_hostname]['ansible_' + _overlay_network.bridge|default(ansible_default_ipv4['interface'])|replace('-', '_')]['ipv4']['address']|default(ansible_host) }}"
       when:
         - is_metal | bool
       tags:
         - always
     - name: set local_ip fact (container)
       set_fact:
-        _local_ip: "{{ _overlay_network.address|default(ansible_ssh_host) }}"
+        _local_ip: "{{ _overlay_network.address|default(ansible_host) }}"
       when:
         - not is_metal | bool
       tags:
diff --git a/playbooks/os-nova-install.yml b/playbooks/os-nova-install.yml
index 2d00279c02..ded810008d 100644
--- a/playbooks/os-nova-install.yml
+++ b/playbooks/os-nova-install.yml
@@ -141,7 +141,7 @@
         - always
     - name: Set nova management address (unknown management network)
       set_fact:
-        management_address: "{{ ansible_ssh_host }}"
+        management_address: "{{ ansible_host }}"
       when:
         - "management_address is undefined"
       tags:
diff --git a/playbooks/unbound-install.yml b/playbooks/unbound-install.yml
index 72c8d73e2a..dcf3398dbf 100644
--- a/playbooks/unbound-install.yml
+++ b/playbooks/unbound-install.yml
@@ -60,9 +60,9 @@
           {% if physical_host is defined
             and hostvars[i]['physical_host'] is defined
             and physical_host == hostvars[i]['physical_host'] -%}
-          {% if _var.append(dict(host=hostvars[i]['ansible_ssh_host'], priority=100)) -%}{% endif -%}
+          {% if _var.append(dict(host=hostvars[i]['ansible_host'], priority=100)) -%}{% endif -%}
           {% else -%}
-          {% if _var.append(dict(host=hostvars[i]['ansible_ssh_host'], priority=50)) -%}{% endif -%}
+          {% if _var.append(dict(host=hostvars[i]['ansible_host'], priority=50)) -%}{% endif -%}
           {% endif -%}
           {% endfor -%}
           {{ _var }}