diff --git a/etc/scenario/gate/fake.yaml.mako b/etc/scenario/gate/fake.yaml.mako
index 245479d7..655b31b9 100644
--- a/etc/scenario/gate/fake.yaml.mako
+++ b/etc/scenario/gate/fake.yaml.mako
@@ -18,8 +18,6 @@ clusters:
         node_processes:
           - datanode
           - jobtracker
-        volumes_per_node: 2
-        volumes_size: 1
         auto_security_group: true
     cluster_template:
       name: fake01
diff --git a/sahara/service/heat/templates.py b/sahara/service/heat/templates.py
index a159281e..48446de9 100644
--- a/sahara/service/heat/templates.py
+++ b/sahara/service/heat/templates.py
@@ -310,7 +310,8 @@ class ClusterStack(object):
             }
         })
 
-        resources.update(self._serialize_volume(ng))
+        if ng.volumes_per_node > 0 and ng.volumes_size > 0:
+            resources.update(self._serialize_volume(ng))
 
         return resources