diff --git a/tcp_tests/managers/envmanager_heat.py b/tcp_tests/managers/envmanager_heat.py
index 8d1e50e..ca1f41d 100644
--- a/tcp_tests/managers/envmanager_heat.py
+++ b/tcp_tests/managers/envmanager_heat.py
@@ -142,7 +142,10 @@
         for stack in stacks:
             if stack_id == stack.id:
                 if stack.parent:
-                    return self.__get_stack_parent(stack.parent, stacks)
+                    try:
+                        return self.__get_stack_parent(stack.parent, stacks)
+                    except Exception:
+                        return stack.id
                 else:
                     return stack.id
         raise Exception("stack with ID {} not found!".format(stack_id))
diff --git a/tcp_tests/templates/_heat_environments/us-cloud.env b/tcp_tests/templates/_heat_environments/us-cloud.env
new file mode 100644
index 0000000..2c194c6
--- /dev/null
+++ b/tcp_tests/templates/_heat_environments/us-cloud.env
@@ -0,0 +1,44 @@
+
+resource_registry:
+  "MCP::MultipleInstance": fragments/MultipleInstance.yaml
+  #"MCP::Flavors": fragments/Flavors.yaml
+  "MCP::MasterNode": fragments/MasterNode.yaml
+  "MCP::Compute": fragments/Compute.yaml
+  "MCP::Networks": fragments/Networks.yaml
+  "MCP::SingleInstance": fragments/Instance.yaml
+  "MCP::FoundationNode": fragments/FoundationNode.yaml
+  "MCP::VsrxNode": fragments/VsrxNode.yaml
+  "MCP::Subnets": fragments/Subnets.yaml
+
+parameter_defaults:
+
+  cfg_flavor: system.virtual.salt_master
+  ctl_flavor: system.compact.openstack.control
+  cid_flavor: system.compact.cicd.control
+  ntw_flavor: system.compact.opencontrail.control
+  nal_flavor: system.compact.opencontrail.analytics
+  dbs_flavor: system.compact.openstack.database
+  msg_flavor: system.compact.openstack.message_queue
+  mon_flavor: system.compact.stacklight.server
+  mdb_flavor: system.compact.openstack.telemetry
+  log_flavor: system.compact.stacklight.log
+  mtr_flavor: system.compact.stacklight.telemetry
+  cmp_flavor: system.virtual.openstack.compute
+  cmn_flavor: system.compact.ceph.mon
+  rgw_flavor: system.compact.ceph.rgw
+  osd_flavor: system.virtual.ceph.osd
+  dns_flavor: system.compact.openstack.dns
+  kmn_flavor: system.compact.openstack.barbican
+  prx_flavor: system.compact.openstack.proxy
+  gtw_flavor: system.compact.openstack.gateway
+  kvm_fake_flavor: system.virtual.fake_kvm
+  foundation_flavor: system.virtual.foundation
+  vsrx_flavor: oc_vsrx
+
+  key_pair: system-key-8133
+  bm_availability_zone: nova
+  vm_availability_zone: nova
+  net_public: public
+
+  foundation_image: system.foundation
+  nameservers: 172.18.208.44
diff --git a/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt-context-cookiecutter-contrail.yaml
index 4a99d5a..5926335 100644
--- a/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt-context-cookiecutter-contrail.yaml
@@ -804,13 +804,13 @@
   stacklight_monitor_node02_hostname: mon02
   stacklight_monitor_node03_address: ==IPV4_NET_CONTROL_PREFIX==.73
   stacklight_monitor_node03_hostname: mon03
-  stacklight_telemetry_address: ==IPV4_NET_CONTROL_PREFIX==.85
+  stacklight_telemetry_address: ==IPV4_NET_CONTROL_PREFIX==.96
   stacklight_telemetry_hostname: mtr
-  stacklight_telemetry_node01_address: ==IPV4_NET_CONTROL_PREFIX==.86
+  stacklight_telemetry_node01_address: ==IPV4_NET_CONTROL_PREFIX==.97
   stacklight_telemetry_node01_hostname: mtr01
-  stacklight_telemetry_node02_address: ==IPV4_NET_CONTROL_PREFIX==.87
+  stacklight_telemetry_node02_address: ==IPV4_NET_CONTROL_PREFIX==.98
   stacklight_telemetry_node02_hostname: mtr02
-  stacklight_telemetry_node03_address: ==IPV4_NET_CONTROL_PREFIX==.88
+  stacklight_telemetry_node03_address: ==IPV4_NET_CONTROL_PREFIX==.99
   stacklight_telemetry_node03_hostname: mtr03
   stacklight_version: '2'
   static_ips_on_deploy_network_enabled: 'False'
diff --git a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml
index 1297a22..9f6522c 100644
--- a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml
@@ -804,13 +804,13 @@
   stacklight_monitor_node02_hostname: mon02
   stacklight_monitor_node03_address: ==IPV4_NET_CONTROL_PREFIX==.73
   stacklight_monitor_node03_hostname: mon03
-  stacklight_telemetry_address: ==IPV4_NET_CONTROL_PREFIX==.85
+  stacklight_telemetry_address: ==IPV4_NET_CONTROL_PREFIX==.96
   stacklight_telemetry_hostname: mtr
-  stacklight_telemetry_node01_address: ==IPV4_NET_CONTROL_PREFIX==.86
+  stacklight_telemetry_node01_address: ==IPV4_NET_CONTROL_PREFIX==.97
   stacklight_telemetry_node01_hostname: mtr01
-  stacklight_telemetry_node02_address: ==IPV4_NET_CONTROL_PREFIX==.87
+  stacklight_telemetry_node02_address: ==IPV4_NET_CONTROL_PREFIX==.98
   stacklight_telemetry_node02_hostname: mtr02
-  stacklight_telemetry_node03_address: ==IPV4_NET_CONTROL_PREFIX==.88
+  stacklight_telemetry_node03_address: ==IPV4_NET_CONTROL_PREFIX==.99
   stacklight_telemetry_node03_hostname: mtr03
   stacklight_version: '2'
   static_ips_on_deploy_network_enabled: 'False'