diff --git a/devstack/lib/tacker b/devstack/lib/tacker
index 58540bf2a..b5f29d53b 100755
--- a/devstack/lib/tacker
+++ b/devstack/lib/tacker
@@ -294,7 +294,7 @@ function configure_tacker {
     iniset $TACKER_CONF servicevm_nova region_name $REGION_NAME
 
     iniset $TACKER_CONF servicevm_heat heat_uri http://$SERVICE_HOST:8004/v1
-    iniset $TACKER_CONF servicevm_heat stack_retries 10
+    iniset $TACKER_CONF servicevm_heat stack_retries 60
     iniset $TACKER_CONF servicevm_heat stack_retry_wait 5
 
     _tacker_setup_rootwrap
diff --git a/etc/tacker/tacker.conf b/etc/tacker/tacker.conf
index 279e28ce6..01663aeb3 100644
--- a/etc/tacker/tacker.conf
+++ b/etc/tacker/tacker.conf
@@ -413,8 +413,8 @@ auth_plugin = password
 
 [servicevm_heat]
 heat_uri = http://localhost:8004/v1
-stack_retries = 5
-stack_retry_wait = 3
+stack_retries = 60
+stack_retry_wait = 5
 
 [servicevm_agent]
 # VM agent requires that an interface driver be set. Choose the one that best
diff --git a/tacker/vm/drivers/heat/heat.py b/tacker/vm/drivers/heat/heat.py
index 608ba9c77..ca7e195e3 100644
--- a/tacker/vm/drivers/heat/heat.py
+++ b/tacker/vm/drivers/heat/heat.py
@@ -36,12 +36,13 @@ LOG = logging.getLogger(__name__)
 CONF = cfg.CONF
 OPTS = [
     cfg.IntOpt('stack_retries',
-               default=10,
-               help=_("Number of attempts to retry for stack deletion")),
+               default=60,
+               help=_("Number of attempts to retry for stack"
+                      "creation/deletion")),
     cfg.IntOpt('stack_retry_wait',
                default=5,
-               help=_("Wait time between two successive stack delete "
-                      "retries")),
+               help=_("Wait time between two successive stack"
+                      "create/delete retries")),
 ]
 CONF.register_opts(OPTS, group='servicevm_heat')
 STACK_RETRIES = cfg.CONF.servicevm_heat.stack_retries