diff --git a/etc/openstack_deploy/openstack_user_config.yml.aio b/etc/openstack_deploy/openstack_user_config.yml.aio
index b35005eb18..0b4d60c322 100644
--- a/etc/openstack_deploy/openstack_user_config.yml.aio
+++ b/etc/openstack_deploy/openstack_user_config.yml.aio
@@ -24,7 +24,7 @@ global_overrides:
   internal_lb_vip_address: 172.29.236.100
   # The external IP is quoted simply to ensure that the .aio file can be used as input
   # dynamic inventory testing.
-  external_lb_vip_address: "{{ bootstrap_host_public_address | default(ansible_default_ipv4.address) }}"
+  external_lb_vip_address: "{{ bootstrap_host_public_address | default(ansible_facts['default_ipv4']['address']) }}"
   management_bridge: "br-mgmt"
   provider_networks:
     - network:
diff --git a/etc/openstack_deploy/openstack_user_config.yml.aio-nspawn.j2 b/etc/openstack_deploy/openstack_user_config.yml.aio-nspawn.j2
index 1859223707..d8618b9494 100644
--- a/etc/openstack_deploy/openstack_user_config.yml.aio-nspawn.j2
+++ b/etc/openstack_deploy/openstack_user_config.yml.aio-nspawn.j2
@@ -17,12 +17,12 @@ used_ips:
 
 global_overrides:
   internal_lb_vip_address: 172.29.236.100
-  external_lb_vip_address: "{{ bootstrap_host_public_address | default(ansible_default_ipv4['address']) }}"
+  external_lb_vip_address: "{{ bootstrap_host_public_address | default(ansible_facts['default_ipv4']['address']) }}"
   tunnel_bridge: "mv-vxlan"
-  management_bridge: "mv-{{ ansible_default_ipv4['alias'] }}"
+  management_bridge: "mv-{{ ansible_facts['default_ipv4']['alias'] }}"
   provider_networks:
     - network:
-        container_bridge: "{{ ansible_default_ipv4['alias'] }}"
+        container_bridge: "{{ ansible_facts['default_ipv4']['alias'] }}"
         container_interface: "mv-container"
         ip_from_q: "container"
         type: "raw"
@@ -31,7 +31,7 @@ global_overrides:
           - all_containers
           - hosts
     - network:
-        container_bridge: "{{ ansible_default_ipv4['alias'] }}"
+        container_bridge: "{{ ansible_facts['default_ipv4']['alias'] }}"
         container_interface: "mv-flat"
         host_bind_override: "mv-flat"
         ip_from_q: "flat"
@@ -45,7 +45,7 @@ global_overrides:
           - rabbitmq
           - utility_all
     - network:
-        container_bridge: "{{ ansible_default_ipv4['alias'] }}"
+        container_bridge: "{{ ansible_facts['default_ipv4']['alias'] }}"
         container_interface: "mv-storage"
         ip_from_q: "storage"
         type: "raw"
@@ -57,7 +57,7 @@ global_overrides:
           - nova_compute
           - swift_proxy
     - network:
-        container_bridge: "{{ ansible_default_ipv4['alias'] }}"
+        container_bridge: "{{ ansible_facts['default_ipv4']['alias'] }}"
         container_interface: "mv-vxlan"
         ip_from_q: "vxlan"
         type: "vxlan"
@@ -106,22 +106,22 @@ aio_block: &aio_info_block
       #                   to it.
       container_extra_networks:
         container_network:
-          bridge: "{{ ansible_default_ipv4['alias'] }}"
+          bridge: "{{ ansible_facts['default_ipv4']['alias'] }}"
           interface: mv-container
           address: 172.29.236.100
           netmask: 255.255.252.0
         flat_network:
-          bridge: "{{ ansible_default_ipv4['alias'] }}"
+          bridge: "{{ ansible_facts['default_ipv4']['alias'] }}"
           interface: mv-flat
           address: 172.29.240.100
           netmask: 255.255.252.0
         storage_network:
-          bridge: "{{ ansible_default_ipv4['alias'] }}"
+          bridge: "{{ ansible_facts['default_ipv4']['alias'] }}"
           interface: mv-storage
           address: 172.29.244.100
           netmask: 255.255.252.0
         vxlan_network:
-          bridge: "{{ ansible_default_ipv4['alias'] }}"
+          bridge: "{{ ansible_facts['default_ipv4']['alias'] }}"
           interface: mv-vxlan
           address: 172.29.248.100
           netmask: 255.255.252.0
diff --git a/etc/openstack_deploy/openstack_user_config.yml.aio.j2 b/etc/openstack_deploy/openstack_user_config.yml.aio.j2
index f17bb07277..7c1206fc53 100644
--- a/etc/openstack_deploy/openstack_user_config.yml.aio.j2
+++ b/etc/openstack_deploy/openstack_user_config.yml.aio.j2
@@ -34,7 +34,7 @@ global_overrides:
   internal_lb_vip_address: 172.29.236.101
   # The external IP is quoted simply to ensure that the .aio file can be used as input
   # dynamic inventory testing.
-  external_lb_vip_address: "{{ bootstrap_host_public_address | default(ansible_default_ipv4.address) }}"
+  external_lb_vip_address: "{{ bootstrap_host_public_address | default(ansible_facts['default_ipv4']['address']) }}"
   management_bridge: "br-mgmt"
   no_containers: {{ true if 'metal' in bootstrap_host_scenarios else false }}
   provider_networks: