diff --git a/defaults/main.yml b/defaults/main.yml
index 29c287b4..183b1196 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -334,8 +334,9 @@ octavia_management_net_dhcp: "True"
 octavia_service_net_setup: True
 # This sets it to the container managment network based on how you setup
 # the provider net
-octavia_container_network_name: "{{ octavia_provider_network_name }}_address"
 octavia_provider_network: "{{ provider_networks|map(attribute='network')|selectattr('net_name','defined')|selectattr('net_name', 'equalto', octavia_provider_network_name)|list|first }}"
+# The name of the network address pool
+octavia_container_network_name: "{{ octavia_provider_network['ip_from_q'] }}_address"
 octavia_hm_group: "octavia-health-manager"
 # Note: We use some heuritsics here but if you do anyhting special make sure to use the
 # ip addresses on the right network. This will use the container newtorking to figure out the ip
diff --git a/tests/host_vars/octavia1.yml b/tests/host_vars/octavia1.yml
index 6cf6fbfb..3c34af3f 100644
--- a/tests/host_vars/octavia1.yml
+++ b/tests/host_vars/octavia1.yml
@@ -30,3 +30,4 @@ container_networks:
     interface: "eth14"
     netmask: "255.255.255.0"
     type: "veth"
+octavia_container_network_name: "lbaas_address"