diff --git a/tcp_tests/templates/_heat_environments/eu-cloud-low-flavors.env b/tcp_tests/templates/_heat_environments/eu-cloud-low-flavors.env
new file mode 100644
index 0000000..f764165
--- /dev/null
+++ b/tcp_tests/templates/_heat_environments/eu-cloud-low-flavors.env
@@ -0,0 +1,48 @@
+
+resource_registry:
+  "MCP::MultipleInstance": fragments/MultipleInstance.yaml
+  "MCP::MultipleInstance2Volumes": fragments/MultipleInstance2Volumes.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::SingleInstance2Volumes": fragments/Instance2Volumes.yaml
+  "MCP::FoundationNode": fragments/FoundationNode.yaml
+  "MCP::FoundationNodeWithFloating": fragments/FoundationNodeWithFloating.yaml
+  "MCP::VsrxNode": fragments/VsrxNode.yaml
+  "MCP::Subnets": fragments/Subnets.yaml
+  "MCP::SubnetsWithFloating": fragments/SubnetsWithFloating.yaml
+
+parameter_defaults:
+
+  cfg_flavor: 8cpu16ram50stor0epf
+  ctl_flavor: 8cpu16ram50stor0epf
+  cid_flavor: 8cpu16ram50stor0epf
+  ntw_flavor: 8cpu16ram50stor0epf
+  nal_flavor: 8cpu16ram50stor0epf
+  dbs_flavor: 8cpu16ram50stor0epf
+  msg_flavor: 8cpu16ram50stor0epf
+  mon_flavor: 8cpu16ram50stor0epf
+  mdb_flavor: 8cpu16ram50stor0epf
+  log_flavor: 8cpu16ram50stor0epf
+  mtr_flavor: 8cpu16ram50stor0epf
+  cmp_flavor: 4cpu8ram100stor10epf
+  cmn_flavor: 4cpu8ram40stor0epf
+  rgw_flavor: 4cpu8ram40stor0epf
+  osd_flavor: 4cpu8ram40stor0epf
+  dns_flavor: 2cpu4ram30stor0epf
+  kmn_flavor: 4cpu8ram40stor0epf
+  prx_flavor: 4cpu8ram40stor0epf
+  gtw_flavor: 4cpu8ram40stor0epf
+  kvm_fake_flavor: 2cpu4ram30stor0epf
+  foundation_flavor: 4cpu8ram100stor10epf
+  vsrx_flavor: oc_vsrx
+
+  key_pair: system_key_8133
+  bm_availability_zone: nova
+  vm_availability_zone: nova
+  net_public: public
+
+  foundation_image: system.foundation01
+  nameservers: 172.18.176.6,172.18.224.6
diff --git a/tcp_tests/templates/_heat_environments/fragments/Instance2Volumes.yaml b/tcp_tests/templates/_heat_environments/fragments/Instance2Volumes.yaml
index 31fa18d..08612a9 100644
--- a/tcp_tests/templates/_heat_environments/fragments/Instance2Volumes.yaml
+++ b/tcp_tests/templates/_heat_environments/fragments/Instance2Volumes.yaml
@@ -90,14 +90,14 @@
     properties:
       volume_id: { get_resource: volume01 }
       instance_uuid: { get_resource: instance_instance }
-      mountpoint: /dev/vdd
+      mountpoint: /dev/vdc
   instance_volume02:
     type: OS::Cinder::VolumeAttachment
     depends_on: [ volume02, instance_volume01 ]
     properties:
       volume_id: { get_resource: volume02 }
       instance_uuid: { get_resource: instance_instance }
-      mountpoint: /dev/vde
+      mountpoint: /dev/vdd
 
   instance_instance:
     type: OS::Nova::Server
diff --git a/tcp_tests/templates/_heat_environments/us-cloud-low-flavors.env b/tcp_tests/templates/_heat_environments/us-cloud-low-flavors.env
new file mode 100644
index 0000000..f38ce92
--- /dev/null
+++ b/tcp_tests/templates/_heat_environments/us-cloud-low-flavors.env
@@ -0,0 +1,48 @@
+
+resource_registry:
+  "MCP::MultipleInstance": fragments/MultipleInstance.yaml
+  "MCP::MultipleInstance2Volumes": fragments/MultipleInstance2Volumes.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::SingleInstance2Volumes": fragments/Instance2Volumes.yaml
+  "MCP::FoundationNode": fragments/FoundationNode.yaml
+  "MCP::FoundationNodeWithFloating": fragments/FoundationNodeWithFloating.yaml
+  "MCP::VsrxNode": fragments/VsrxNode.yaml
+  "MCP::Subnets": fragments/Subnets.yaml
+  "MCP::SubnetsWithFloating": fragments/SubnetsWithFloating.yaml
+
+parameter_defaults:
+
+  cfg_flavor: 8cpu16ram50stor0epf
+  ctl_flavor: 8cpu16ram50stor0epf
+  cid_flavor: 8cpu16ram50stor0epf
+  ntw_flavor: 8cpu16ram50stor0epf
+  nal_flavor: 8cpu16ram50stor0epf
+  dbs_flavor: 8cpu16ram50stor0epf
+  msg_flavor: 8cpu16ram50stor0epf
+  mon_flavor: 8cpu16ram50stor0epf
+  mdb_flavor: 8cpu16ram50stor0epf
+  log_flavor: 8cpu16ram50stor0epf
+  mtr_flavor: 8cpu16ram50stor0epf
+  cmp_flavor: 4cpu8ram100stor10epf
+  cmn_flavor: 4cpu8ram40stor0epf
+  rgw_flavor: 4cpu8ram40stor0epf
+  osd_flavor: 4cpu8ram40stor0epf
+  dns_flavor: 2cpu4ram30stor0epf
+  kmn_flavor: 4cpu8ram40stor0epf
+  prx_flavor: 4cpu8ram40stor0epf
+  gtw_flavor: 4cpu8ram40stor0epf
+  kvm_fake_flavor: 2cpu4ram30stor0epf
+  foundation_flavor: 4cpu8ram100stor10epf
+  vsrx_flavor: oc_vsrx
+
+  key_pair: system-key-8133
+  bm_availability_zone: nova
+  vm_availability_zone: nova
+  net_public: public
+
+  foundation_image: system.foundation01
+  nameservers: 172.18.224.6,172.18.176.6
diff --git a/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
index 554a306..8ad96c6 100644
--- a/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
@@ -52,8 +52,8 @@
   ceph_osd_bond_mode: active-backup
   ceph_osd_data_partition_prefix: ""
   ceph_osd_count: '3'
-  ceph_osd_data_disks: "/dev/vdd"
-  ceph_osd_journal_or_block_db_disks: "/dev/vde"
+  ceph_osd_data_disks: "/dev/vdc"
+  ceph_osd_journal_or_block_db_disks: "/dev/vdd"
   ceph_osd_node_count: '3'
   ceph_osd_journal_size: '3'
   ceph_osd_deploy_nic: "eth0"
diff --git a/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
index a3b6311..63f0f22 100644
--- a/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
@@ -270,7 +270,7 @@
   ceph_osd_storage_address_ranges: "==IPV4_NET_CONTROL_PREFIX==.201-==IPV4_NET_CONTROL_PREFIX==.203"
   ceph_osd_backend_address_ranges: "==IPV4_NET_TENANT_PREFIX==.201-==IPV4_NET_TENANT_PREFIX==.203"
 
-  ceph_osd_data_disks: "/dev/vdd"
+  ceph_osd_data_disks: "/dev/vdc"
   ceph_osd_journal_or_block_db_disks: ""
   ceph_osd_mode: "separated"
   ceph_osd_deploy_nic: "eth0"
diff --git a/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
index 378fde9..4522bd7 100644
--- a/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
@@ -59,8 +59,8 @@
   ceph_osd_data_partition_prefix: ""
   ceph_osd_bond_mode: active-backup
   ceph_osd_count: '3'
-  ceph_osd_data_disks: "/dev/vdd"
-  ceph_osd_journal_or_block_db_disks: "/dev/vde"
+  ceph_osd_data_disks: "/dev/vdc"
+  ceph_osd_journal_or_block_db_disks: "/dev/vdd"
   ceph_osd_mode: "separated"
   ceph_osd_node_count: '3'
   ceph_osd_journal_size: '3'
diff --git a/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml
index 47e1c66..39eb138 100644
--- a/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml
@@ -275,7 +275,7 @@
   ceph_osd_storage_address_ranges: "==IPV4_NET_CONTROL_PREFIX==.201-==IPV4_NET_CONTROL_PREFIX==.203"
   ceph_osd_backend_address_ranges: "==IPV4_NET_TENANT_PREFIX==.201-==IPV4_NET_TENANT_PREFIX==.203"
 
-  ceph_osd_data_disks: "/dev/vdd"
+  ceph_osd_data_disks: "/dev/vdc"
   ceph_osd_journal_or_block_db_disks: ""
   ceph_osd_mode: "separated"
   ceph_osd_deploy_nic: "eth0"
diff --git a/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
index e8afd72..c62c526 100644
--- a/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
@@ -50,8 +50,8 @@
   ceph_osd_bond_mode: active-backup
   ceph_osd_data_partition_prefix: ""
   ceph_osd_count: '3'
-  ceph_osd_data_disks: "/dev/vdd"
-  ceph_osd_journal_or_block_db_disks: "/dev/vde"
+  ceph_osd_data_disks: "/dev/vdc"
+  ceph_osd_journal_or_block_db_disks: "/dev/vdd"
   ceph_osd_node_count: '3'
   ceph_osd_journal_size: '3'
   ceph_osd_deploy_nic: "eth0"
diff --git a/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
index b66aec1..5d791e8 100644
--- a/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
@@ -264,8 +264,8 @@
   ceph_osd_storage_address_ranges: "==IPV4_NET_CONTROL_PREFIX==.201-==IPV4_NET_CONTROL_PREFIX==.203"
   ceph_osd_backend_address_ranges: "==IPV4_NET_TENANT_PREFIX==.201-==IPV4_NET_TENANT_PREFIX==.203"
 
-  ceph_osd_data_disks: "/dev/vdb"
-  ceph_osd_journal_or_block_db_disks: "/dev/vdb"
+  ceph_osd_data_disks: "/dev/vdc"
+  ceph_osd_journal_or_block_db_disks: "/dev/vdd"
   ceph_osd_mode: "separated"
   ceph_osd_deploy_nic: "eth0"
   ceph_osd_primary_first_nic: "eth1"
diff --git a/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
index f382627..d14b2e9 100644
--- a/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
@@ -60,8 +60,8 @@
   ceph_osd_data_partition_prefix: ""
   ceph_osd_bond_mode: active-backup
   ceph_osd_count: '3'
-  ceph_osd_data_disks: "/dev/vdd"
-  ceph_osd_journal_or_block_db_disks: "/dev/vde"
+  ceph_osd_data_disks: "/dev/vdc"
+  ceph_osd_journal_or_block_db_disks: "/dev/vdd"
   ceph_osd_mode: "separated"
   ceph_osd_node_count: '3'
   ceph_osd_journal_size: '3'