diff --git a/tests/group_vars/all_containers.yml b/tests/group_vars/all_containers.yml
index f37df47c..802a50f4 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/cinder.yml b/tests/host_vars/cinder.yml
index 1f172ba5..15f552ac 100644
--- a/tests/host_vars/cinder.yml
+++ b/tests/host_vars/cinder.yml
@@ -16,3 +16,4 @@
 ansible_host: 10.1.1.103
 ansible_become: True
 ansible_user: root
+container_name: cinder
diff --git a/tests/host_vars/infra1.yml b/tests/host_vars/infra1.yml
index bfdc1359..257556fa 100644
--- a/tests/host_vars/infra1.yml
+++ b/tests/host_vars/infra1.yml
@@ -16,3 +16,4 @@
 ansible_host: 10.1.1.101
 ansible_become: True
 ansible_user: root
+container_name: infra1
diff --git a/tests/host_vars/keystone.yml b/tests/host_vars/keystone.yml
index e50c2381..086fdf6d 100644
--- a/tests/host_vars/keystone.yml
+++ b/tests/host_vars/keystone.yml
@@ -16,3 +16,4 @@
 ansible_host: 10.1.1.102
 ansible_become: True
 ansible_user: root
+container_name: keystone