diff --git a/tests/group_vars/all_containers.yml b/tests/group_vars/all_containers.yml
index 176c80f..aee5b4a 100644
--- a/tests/group_vars/all_containers.yml
+++ b/tests/group_vars/all_containers.yml
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 ansible_host: "{{ ansible_host }}"
-container_name: "{{ inventory_hostname }}"
 container_networks:
   management_address:
     address: "{{ ansible_host }}"
diff --git a/tests/host_vars/aodh.yml b/tests/host_vars/aodh.yml
index c7e6a71..c8575d4 100644
--- a/tests/host_vars/aodh.yml
+++ b/tests/host_vars/aodh.yml
@@ -17,3 +17,4 @@
 ansible_host: 10.1.0.5
 ansible_become: True
 ansible_user: root
+container_name: aodh
diff --git a/tests/host_vars/gnocchi.yml b/tests/host_vars/gnocchi.yml
index 00b95f0..0e67816 100644
--- a/tests/host_vars/gnocchi.yml
+++ b/tests/host_vars/gnocchi.yml
@@ -17,3 +17,4 @@
 ansible_host: 10.1.0.4
 ansible_become: True
 ansible_user: root
+container_name: gnocchi
diff --git a/tests/host_vars/infra1.yml b/tests/host_vars/infra1.yml
index 86d45ff..fcf92eb 100644
--- a/tests/host_vars/infra1.yml
+++ b/tests/host_vars/infra1.yml
@@ -16,3 +16,4 @@
 ansible_host: 10.1.0.2
 ansible_become: True
 ansible_user: root
+container_name: infra1
diff --git a/tests/host_vars/openstack1.yml b/tests/host_vars/openstack1.yml
index 23b9498..0290962 100644
--- a/tests/host_vars/openstack1.yml
+++ b/tests/host_vars/openstack1.yml
@@ -16,3 +16,4 @@
 ansible_host: 10.1.0.3
 ansible_become: True
 ansible_user: root
+container_name: openstack1