diff --git a/tcp_tests/templates/_heat_environments/fragments/Networks.yaml b/tcp_tests/templates/_heat_environments/fragments/Networks.yaml
index 5840d80..11cc4a5 100644
--- a/tcp_tests/templates/_heat_environments/fragments/Networks.yaml
+++ b/tcp_tests/templates/_heat_environments/fragments/Networks.yaml
@@ -11,16 +11,19 @@
 
 resources:
   control_net:
+    depends_on: tenant_net
     type: OS::Neutron::Net
     properties:
       port_security_enabled: false
       name: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
   tenant_net:
+    depends_on: management_net
     type: OS::Neutron::Net
     properties:
       port_security_enabled: false
       name: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
   management_net:
+    depends_on: external_net
     type: OS::Neutron::Net
     properties:
       port_security_enabled: false
diff --git a/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/underlay.hot b/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/underlay.hot
index 0afbd66..cffb044 100644
--- a/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/underlay.hot
+++ b/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/underlay.hot
@@ -1,6 +1,6 @@
 ---
 
-heat_template_version: pike
+heat_template_version: queens
 
 description: MCP environment for heat-bm-cicd-pike-contrail-sl