diff --git a/tests/group_vars/all_containers.yml b/tests/group_vars/all_containers.yml
index 2245b745..0a2006ed 100644
--- a/tests/group_vars/all_containers.yml
+++ b/tests/group_vars/all_containers.yml
@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-container_name: "{{ inventory_hostname }}"
 container_networks:
   management_address:
     address: "{{ ansible_host }}"
diff --git a/tests/host_vars/infra1.yml b/tests/host_vars/infra1.yml
index 15318d86..5d137425 100644
--- a/tests/host_vars/infra1.yml
+++ b/tests/host_vars/infra1.yml
@@ -16,4 +16,5 @@
 ansible_host: 10.1.1.101
 ansible_become: True
 ansible_user: root
+container_name: infra1
 tunnel_address: 10.1.2.101
diff --git a/tests/host_vars/openstack1.yml b/tests/host_vars/openstack1.yml
index e08a3c7a..86dc31fd 100644
--- a/tests/host_vars/openstack1.yml
+++ b/tests/host_vars/openstack1.yml
@@ -20,5 +20,6 @@ neutron_provider_networks:
 ansible_host: 10.1.1.102
 ansible_become: True
 ansible_user: root
+container_name: openstack1
 tunnel_address: 10.1.2.102
 neutron_local_ip: 10.1.2.102