diff --git a/tests/group_vars/all_containers.yml b/tests/group_vars/all_containers.yml
index 2245b74..0a2006e 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 15318d8..3a1379b 100644
--- a/tests/host_vars/infra1.yml
+++ b/tests/host_vars/infra1.yml
@@ -17,3 +17,4 @@ ansible_host: 10.1.1.101
 ansible_become: True
 ansible_user: root
 tunnel_address: 10.1.2.101
+container_name: infra1
diff --git a/tests/host_vars/openstack1.yml b/tests/host_vars/openstack1.yml
index e08a3c7..10b7024 100644
--- a/tests/host_vars/openstack1.yml
+++ b/tests/host_vars/openstack1.yml
@@ -22,3 +22,4 @@ ansible_become: True
 ansible_user: root
 tunnel_address: 10.1.2.102
 neutron_local_ip: 10.1.2.102
+container_name: openstack1