diff --git a/tests/group_vars/all_containers.yml b/tests/group_vars/all_containers.yml
index 08c4f7ff..ad4359a9 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 }}"
 physical_host: localhost
 properties:
   service_name: "{{ inventory_hostname }}"
\ No newline at end of file
diff --git a/tests/host_vars/infra1.yml b/tests/host_vars/infra1.yml
index 05c9e791..d1503e44 100644
--- a/tests/host_vars/infra1.yml
+++ b/tests/host_vars/infra1.yml
@@ -16,6 +16,7 @@
 ansible_host: 10.1.1.101
 ansible_become: True
 ansible_user: root
+container_name: infra1
 container_networks:
   management_address:
     address: "{{ ansible_host }}"
diff --git a/tests/host_vars/octavia1.yml b/tests/host_vars/octavia1.yml
index 6cf6fbfb..0680b5d3 100644
--- a/tests/host_vars/octavia1.yml
+++ b/tests/host_vars/octavia1.yml
@@ -16,6 +16,7 @@
 ansible_host: 10.1.1.104
 ansible_become: True
 ansible_user: root
+container_name: octavia1
 lbaas_address: 10.1.7.104
 container_networks:
   management_address:
diff --git a/tests/host_vars/openstack1.yml b/tests/host_vars/openstack1.yml
index b8e0ae19..2499e1c7 100644
--- a/tests/host_vars/openstack1.yml
+++ b/tests/host_vars/openstack1.yml
@@ -19,7 +19,7 @@ ansible_user: root
 tunnel_address: 10.1.2.102
 neutron_local_ip: 10.1.2.102
 storage_address: 10.1.5.102
-container_name: "{{ inventory_hostname }}"
+container_name: openstack1
 container_networks:
   management_address:
     address: "{{ ansible_host }}"
diff --git a/tests/host_vars/swift-storage1.yml b/tests/host_vars/swift-storage1.yml
index 65a2cc9c..79a2bb3e 100644
--- a/tests/host_vars/swift-storage1.yml
+++ b/tests/host_vars/swift-storage1.yml
@@ -17,6 +17,7 @@ ansible_host: 10.1.1.103
 storage_address: 10.1.5.103
 ansible_user: root
 ansible_become: True
+container_name: swift-storage1
 container_networks:
   management_address:
     address: "{{ ansible_host }}"