diff --git a/tcp_tests/templates/released-bm-b300-cicd-queens-ovs-maas/openstack_vcompute_cluster.yml b/tcp_tests/templates/released-bm-b300-cicd-queens-ovs-maas/openstack_vcompute_cluster.yml
index f5a46f8..3e9f686 100644
--- a/tcp_tests/templates/released-bm-b300-cicd-queens-ovs-maas/openstack_vcompute_cluster.yml
+++ b/tcp_tests/templates/released-bm-b300-cicd-queens-ovs-maas/openstack_vcompute_cluster.yml
@@ -297,21 +297,21 @@
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
             vcmp42:
               name: ${_param:openstack_vcmp_node42_hostname}
-              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
               image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_database_backend_image}
               size: openstack.database
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
             vcmp43:
               name: ${_param:openstack_vcmp_node43_hostname}
-              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
               image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_database_backend_image}
               size: openstack.database
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
             vcmp44:
               name: ${_param:openstack_vcmp_node44_hostname}
-              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
               image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_database_backend_image}
               size: openstack.database
@@ -591,21 +591,21 @@
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
             vcmp84:
               name: ${_param:openstack_vcmp_node84_hostname}
-              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
               image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_database_backend_image}
               size: openstack.database
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
             vcmp85:
               name: ${_param:openstack_vcmp_node85_hostname}
-              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
               image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_database_backend_image}
               size: openstack.database
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
             vcmp86:
               name: ${_param:openstack_vcmp_node86_hostname}
-              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
               image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_database_backend_image}
               size: openstack.database
@@ -885,21 +885,21 @@
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
             vcmp126:
               name: ${_param:openstack_vcmp_node126_hostname}
-              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
               image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_database_backend_image}
               size: openstack.database
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
             vcmp127:
               name: ${_param:openstack_vcmp_node127_hostname}
-              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
               image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_database_backend_image}
               size: openstack.database
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
             vcmp128:
               name: ${_param:openstack_vcmp_node128_hostname}
-              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
               image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_database_backend_image}
               size: openstack.database
@@ -1179,21 +1179,21 @@
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
             vcmp168:
               name: ${_param:openstack_vcmp_node168_hostname}
-              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
               image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_database_backend_image}
               size: openstack.database
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
             vcmp169:
               name: ${_param:openstack_vcmp_node169_hostname}
-              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
               image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_database_backend_image}
               size: openstack.database
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
             vcmp170:
               name: ${_param:openstack_vcmp_node170_hostname}
-              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
               image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_database_backend_image}
               size: openstack.database
@@ -1473,21 +1473,21 @@
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
             vcmp210:
               name: ${_param:openstack_vcmp_node210_hostname}
-              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
               image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_database_backend_image}
               size: openstack.database
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
             vcmp211:
               name: ${_param:openstack_vcmp_node211_hostname}
-              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
               image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_database_backend_image}
               size: openstack.database
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
             vcmp212:
               name: ${_param:openstack_vcmp_node212_hostname}
-              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
               image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_database_backend_image}
               size: openstack.database