diff --git a/scenarios/onap-nofeature-noha/kubespray/role/onap-nofeature-noha/files/heat-environment-city-centos7-core.yaml b/scenarios/onap-nofeature-noha/kubespray/role/onap-nofeature-noha/files/heat-environment-city-centos7-core.yaml
index 5a253a9..9324de6 100644
--- a/scenarios/onap-nofeature-noha/kubespray/role/onap-nofeature-noha/files/heat-environment-city-centos7-core.yaml
+++ b/scenarios/onap-nofeature-noha/kubespray/role/onap-nofeature-noha/files/heat-environment-city-centos7-core.yaml
@@ -21,20 +21,22 @@
 parameters:
   # parameters for jumphost
   jumphost_image: 'est-centos7-1901'
-  jumphost_flavor: 1C-2GB
+  jumphost_flavor: 16C-16GB-20GB
+  jumphost_volume_size: 300
 
   # parameters for master nodes
   no_of_master_nodes: 1
   master_image: 'est-centos7-1901'
   master_flavor: 4C-8GB
+  master_volume_size: 150
 
   # parameters for worker nodes
   no_of_worker_nodes: 3
   worker_image: 'est-centos7-1901'
   worker_flavor: 16C-32GB
+  worker_volume_size: 80
 
   # common parameters
-  volume_size: 150
   public_network: ext-net
   dns_nameservers: ['8.8.8.8', '8.8.4.4']
 
diff --git a/scenarios/onap-nofeature-noha/kubespray/role/onap-nofeature-noha/files/heat-environment-city-centos7-full.yaml b/scenarios/onap-nofeature-noha/kubespray/role/onap-nofeature-noha/files/heat-environment-city-centos7-full.yaml
index c46b1f6..50d29ff 100644
--- a/scenarios/onap-nofeature-noha/kubespray/role/onap-nofeature-noha/files/heat-environment-city-centos7-full.yaml
+++ b/scenarios/onap-nofeature-noha/kubespray/role/onap-nofeature-noha/files/heat-environment-city-centos7-full.yaml
@@ -21,20 +21,22 @@
 parameters:
   # parameters for jumphost
   jumphost_image: 'est-centos7-1901'
-  jumphost_flavor: 8C-16GB
+  jumphost_flavor: 16C-16GB-20GB
+  jumphost_volume_size: 300
 
   # parameters for master nodes
   no_of_master_nodes: 1
   master_image: 'est-centos7-1901'
   master_flavor: 8C-8GB-20GB
+  master_volume_size: 150
 
   # parameters for worker nodes
   no_of_worker_nodes: 6
   worker_image: 'est-centos7-1901'
   worker_flavor: 8C-32GB-20GB
+  worker_volume_size: 80
 
   # common parameters
-  volume_size: 300
   public_network: ext-net
   dns_nameservers: ['8.8.8.8', '8.8.4.4']
 
diff --git a/scenarios/onap-nofeature-noha/kubespray/role/onap-nofeature-noha/files/heat-environment-core.yaml b/scenarios/onap-nofeature-noha/kubespray/role/onap-nofeature-noha/files/heat-environment-core.yaml
index 0c53cb2..7775d90 100644
--- a/scenarios/onap-nofeature-noha/kubespray/role/onap-nofeature-noha/files/heat-environment-core.yaml
+++ b/scenarios/onap-nofeature-noha/kubespray/role/onap-nofeature-noha/files/heat-environment-core.yaml
@@ -22,19 +22,21 @@
   # parameters for jumphost
   jumphost_image: 'Ubuntu 18.04 Bionic Beaver'
   jumphost_flavor: 1C-2GB
+  jumphost_volume_size: 150
 
   # parameters for master nodes
   no_of_master_nodes: 1
   master_image: 'Ubuntu 18.04 Bionic Beaver'
   master_flavor: 4C-8GB
+  master_volume_size: 150
 
   # parameters for worker nodes
   no_of_worker_nodes: 3
   worker_image: 'Ubuntu 18.04 Bionic Beaver'
   worker_flavor: 16C-32GB
+  worker_volume_size: 150
 
   # common parameters
-  volume_size: 150
   public_network: ext-net
   dns_nameservers: ['8.8.8.8', '8.8.4.4']
 
diff --git a/scenarios/onap-nofeature-noha/kubespray/role/onap-nofeature-noha/files/heat-environment-full.yaml b/scenarios/onap-nofeature-noha/kubespray/role/onap-nofeature-noha/files/heat-environment-full.yaml
index 68a2400..b515092 100644
--- a/scenarios/onap-nofeature-noha/kubespray/role/onap-nofeature-noha/files/heat-environment-full.yaml
+++ b/scenarios/onap-nofeature-noha/kubespray/role/onap-nofeature-noha/files/heat-environment-full.yaml
@@ -22,19 +22,21 @@
   # parameters for jumphost
   jumphost_image: 'Ubuntu 18.04 Bionic Beaver'
   jumphost_flavor: 1C-2GB
+  jumphost_volume_size: 150
 
   # parameters for master nodes
   no_of_master_nodes: 1
   master_image: 'Ubuntu 18.04 Bionic Beaver'
   master_flavor: 4C-8GB
+  master_volume_size: 150
 
   # parameters for worker nodes
   no_of_worker_nodes: 8
   worker_image: 'Ubuntu 18.04 Bionic Beaver'
   worker_flavor: 16C-32GB
+  worker_volume_size: 150
 
   # common parameters
-  volume_size: 150
   public_network: ext-net
   dns_nameservers: ['8.8.8.8', '8.8.4.4']
 
diff --git a/scenarios/onap-nofeature-noha/kubespray/role/onap-nofeature-noha/files/heat-environment-xerces-centos7-core.yaml b/scenarios/onap-nofeature-noha/kubespray/role/onap-nofeature-noha/files/heat-environment-xerces-centos7-core.yaml
index 0c311c1..75b2641 100644
--- a/scenarios/onap-nofeature-noha/kubespray/role/onap-nofeature-noha/files/heat-environment-xerces-centos7-core.yaml
+++ b/scenarios/onap-nofeature-noha/kubespray/role/onap-nofeature-noha/files/heat-environment-xerces-centos7-core.yaml
@@ -22,19 +22,21 @@
   # parameters for jumphost
   jumphost_image: 'CentOS-7-x86_64-GenericCloud-1901'
   jumphost_flavor: c4m4
+  jumphost_volume_size: 300
 
   # parameters for master nodes
   no_of_master_nodes: 1
   master_image: 'CentOS-7-x86_64-GenericCloud-1901'
   master_flavor: c4m8
+  master_volume_size: 150
 
   # parameters for worker nodes
   no_of_worker_nodes: 3
   worker_image: 'CentOS-7-x86_64-GenericCloud-1901'
   worker_flavor: c16m32
+  worker_volume_size: 80
 
   # common parameters
-  volume_size: 150
   public_network: internet
   dns_nameservers: ['8.8.8.8', '8.8.4.4']
 
diff --git a/scenarios/onap-nofeature-noha/kubespray/role/onap-nofeature-noha/files/heat-environment-xerces-centos7-full.yaml b/scenarios/onap-nofeature-noha/kubespray/role/onap-nofeature-noha/files/heat-environment-xerces-centos7-full.yaml
index a06f41c..98bc431 100644
--- a/scenarios/onap-nofeature-noha/kubespray/role/onap-nofeature-noha/files/heat-environment-xerces-centos7-full.yaml
+++ b/scenarios/onap-nofeature-noha/kubespray/role/onap-nofeature-noha/files/heat-environment-xerces-centos7-full.yaml
@@ -22,19 +22,21 @@
   # parameters for jumphost
   jumphost_image: 'CentOS-7-x86_64-GenericCloud-1901'
   jumphost_flavor: c4m4
+  jumphost_volume_size: 300
 
   # parameters for master nodes
   no_of_master_nodes: 1
   master_image: 'CentOS-7-x86_64-GenericCloud-1901'
   master_flavor: c4m8
+  master_volume_size: 150
 
   # parameters for worker nodes
   no_of_worker_nodes: 12
   worker_image: 'CentOS-7-x86_64-GenericCloud-1901'
   worker_flavor: c8m16
+  worker_volume_size: 80
 
   # common parameters
-  volume_size: 150
   public_network: internet
   dns_nameservers: ['8.8.8.8', '8.8.4.4']
 
diff --git a/scenarios/onap-nofeature-noha/kubespray/role/onap-nofeature-noha/files/heat-environment-xerces-ubuntu1804-core.yaml b/scenarios/onap-nofeature-noha/kubespray/role/onap-nofeature-noha/files/heat-environment-xerces-ubuntu1804-core.yaml
index b37adfe..ec30315 100644
--- a/scenarios/onap-nofeature-noha/kubespray/role/onap-nofeature-noha/files/heat-environment-xerces-ubuntu1804-core.yaml
+++ b/scenarios/onap-nofeature-noha/kubespray/role/onap-nofeature-noha/files/heat-environment-xerces-ubuntu1804-core.yaml
@@ -17,24 +17,26 @@
 # SPDX-License-Identifier: Apache-2.0
 # ============LICENSE_END=========================================================
 
-# NOTE: this heat environment file creates resources for core ONAP deployment 
+# NOTE: this heat environment file creates resources for core ONAP deployment
 parameters:
   # parameters for jumphost
   jumphost_image: 'Ubuntu 18.04'
   jumphost_flavor: c4m4
+  jumphost_volume_size: 150
 
   # parameters for master nodes
   no_of_master_nodes: 1
   master_image: 'Ubuntu 18.04'
   master_flavor: c4m8
+  master_volume_size: 150
 
   # parameters for worker nodes
   no_of_worker_nodes: 3
   worker_image: 'Ubuntu 18.04'
   worker_flavor: c16m32
+  worker_volume_size: 150
 
   # common parameters
-  volume_size: 150
   public_network: internet
   dns_nameservers: ['8.8.8.8', '8.8.4.4']
 
diff --git a/scenarios/onap-nofeature-noha/kubespray/role/onap-nofeature-noha/files/heat-environment-xerces-ubuntu1804-full.yaml b/scenarios/onap-nofeature-noha/kubespray/role/onap-nofeature-noha/files/heat-environment-xerces-ubuntu1804-full.yaml
index e89151a..f048c1b 100644
--- a/scenarios/onap-nofeature-noha/kubespray/role/onap-nofeature-noha/files/heat-environment-xerces-ubuntu1804-full.yaml
+++ b/scenarios/onap-nofeature-noha/kubespray/role/onap-nofeature-noha/files/heat-environment-xerces-ubuntu1804-full.yaml
@@ -17,24 +17,26 @@
 # SPDX-License-Identifier: Apache-2.0
 # ============LICENSE_END=========================================================
 
-# NOTE: this heat environment file creates resources for full ONAP deployment 
+# NOTE: this heat environment file creates resources for full ONAP deployment
 parameters:
   # parameters for jumphost
   jumphost_image: 'Ubuntu 18.04'
   jumphost_flavor: c4m4
+  jumphost_volume_size: 150
 
   # parameters for master nodes
   no_of_master_nodes: 1
   master_image: 'Ubuntu 18.04'
   master_flavor: c4m8
+  master_volume_size: 150
 
   # parameters for worker nodes
   no_of_worker_nodes: 12
   worker_image: 'Ubuntu 18.04'
   worker_flavor: c8m16
+  worker_volume_size: 150
 
   # common parameters
-  volume_size: 150
   public_network: internet
   dns_nameservers: ['8.8.8.8', '8.8.4.4']