diff --git a/sahara/service/heat/templates.py b/sahara/service/heat/templates.py
index fbd1ff1a65..99b155ebb2 100644
--- a/sahara/service/heat/templates.py
+++ b/sahara/service/heat/templates.py
@@ -129,10 +129,8 @@ class ClusterStack(object):
         if not update_existing:
             b.execute_with_retries(heat.stacks.create, **kwargs)
         else:
-            for stack in b.execute_with_retries(heat.stacks.list):
-                if stack.stack_name == self.cluster.name:
-                    b.execute_with_retries(stack.update, **kwargs)
-                    break
+            stack = h.get_stack(self.cluster.name)
+            b.execute_with_retries(stack.update, **kwargs)
 
         self.heat_stack = h.get_stack(self.cluster.name)