diff --git a/README.rst b/README.rst
index 7df62e0..bb543ff 100644
--- a/README.rst
+++ b/README.rst
@@ -68,6 +68,7 @@
           ha_queues: True
         max_stacks_per_tenant: 150
         max_nested_stack_depth: 10
+        stack_action_timeout: 7200
 
 Define server clients Keystone parameter:
 
diff --git a/heat/files/juno/heat.conf.Debian b/heat/files/juno/heat.conf.Debian
index 1673e2b..1efea22 100644
--- a/heat/files/juno/heat.conf.Debian
+++ b/heat/files/juno/heat.conf.Debian
@@ -61,6 +61,12 @@
 max_nested_stack_depth = {{ server.max_nested_stack_depth }}
 {%- endif %}
 
+# Timeout in seconds for stack action (ie. create or update). (integer value)
+#stack_action_timeout = 3600
+{%- if server.stack_action_timeout is defined %}
+stack_action_timeout = {{ server.stack_action_timeout }}
+{%- endif %}
+
 # Number of times to retry to bring a resource to a non-error
 # state. Set to 0 to disable retries. (integer value)
 #action_retry_limit=5
diff --git a/heat/files/kilo/heat.conf.Debian b/heat/files/kilo/heat.conf.Debian
index f9224c2..5ddc49f 100644
--- a/heat/files/kilo/heat.conf.Debian
+++ b/heat/files/kilo/heat.conf.Debian
@@ -201,6 +201,12 @@
 max_nested_stack_depth = {{ server.max_nested_stack_depth }}
 {%- endif %}
 
+# Timeout in seconds for stack action (ie. create or update). (integer value)
+#stack_action_timeout = 3600
+{%- if server.stack_action_timeout is defined %}
+stack_action_timeout = {{ server.stack_action_timeout }}
+{%- endif %}
+
 [heat_api]
 
 #
diff --git a/heat/files/liberty/heat.conf.Debian b/heat/files/liberty/heat.conf.Debian
index d7f47cc..6fd5bcb 100644
--- a/heat/files/liberty/heat.conf.Debian
+++ b/heat/files/liberty/heat.conf.Debian
@@ -208,6 +208,12 @@
 max_nested_stack_depth = {{ server.max_nested_stack_depth }}
 {%- endif %}
 
+# Timeout in seconds for stack action (ie. create or update). (integer value)
+#stack_action_timeout = 3600
+{%- if server.stack_action_timeout is defined %}
+stack_action_timeout = {{ server.stack_action_timeout }}
+{%- endif %}
+
 [heat_api]
 
 #
diff --git a/heat/files/mitaka/heat.conf.Debian b/heat/files/mitaka/heat.conf.Debian
index bfaa6f9..0bf626e 100644
--- a/heat/files/mitaka/heat.conf.Debian
+++ b/heat/files/mitaka/heat.conf.Debian
@@ -216,6 +216,12 @@
 max_nested_stack_depth = {{ server.max_nested_stack_depth }}
 {%- endif %}
 
+# Timeout in seconds for stack action (ie. create or update). (integer value)
+#stack_action_timeout = 3600
+{%- if server.stack_action_timeout is defined %}
+stack_action_timeout = {{ server.stack_action_timeout }}
+{%- endif %}
+
 [heat_api]
 
 #
diff --git a/heat/files/newton/heat.conf.Debian b/heat/files/newton/heat.conf.Debian
index 02e5870..ca160e4 100644
--- a/heat/files/newton/heat.conf.Debian
+++ b/heat/files/newton/heat.conf.Debian
@@ -226,6 +226,12 @@
 max_nested_stack_depth = {{ server.max_nested_stack_depth }}
 {%- endif %}
 
+# Timeout in seconds for stack action (ie. create or update). (integer value)
+#stack_action_timeout = 3600
+{%- if server.stack_action_timeout is defined %}
+stack_action_timeout = {{ server.stack_action_timeout }}
+{%- endif %}
+
 [heat_api]
 
 #
diff --git a/heat/files/ocata/heat.conf.Debian b/heat/files/ocata/heat.conf.Debian
index f00a537..3ad453c 100644
--- a/heat/files/ocata/heat.conf.Debian
+++ b/heat/files/ocata/heat.conf.Debian
@@ -92,7 +92,9 @@
 
 # Timeout in seconds for stack action (ie. create or update). (integer value)
 #stack_action_timeout = 3600
-
+{%- if server.stack_action_timeout is defined %}
+stack_action_timeout = {{ server.stack_action_timeout }}
+{%- endif %}
 # The amount of time in seconds after an error has occurred that tasks may
 # continue to run before being cancelled. (integer value)
 #error_wait_time = 240
diff --git a/heat/files/pike/heat.conf.Debian b/heat/files/pike/heat.conf.Debian
index 0c970b1..4a192b1 100644
--- a/heat/files/pike/heat.conf.Debian
+++ b/heat/files/pike/heat.conf.Debian
@@ -99,7 +99,9 @@
 
 # Timeout in seconds for stack action (ie. create or update). (integer value)
 #stack_action_timeout = 3600
-
+{%- if server.stack_action_timeout is defined %}
+stack_action_timeout = {{ server.stack_action_timeout }}
+{%- endif %}
 # The amount of time in seconds after an error has occurred that tasks may
 # continue to run before being cancelled. (integer value)
 #error_wait_time = 240
diff --git a/heat/files/queens/heat.conf.Debian b/heat/files/queens/heat.conf.Debian
index 55faaa2..cdf0c5b 100644
--- a/heat/files/queens/heat.conf.Debian
+++ b/heat/files/queens/heat.conf.Debian
@@ -90,7 +90,9 @@
 
 # Timeout in seconds for stack action (ie. create or update). (integer value)
 #stack_action_timeout = 3600
-
+{%- if server.stack_action_timeout is defined %}
+stack_action_timeout = {{ server.stack_action_timeout }}
+{%- endif %}
 # The amount of time in seconds after an error has occurred that tasks may
 # continue to run before being cancelled. (integer value)
 #error_wait_time = 240
diff --git a/tests/pillar/server_single.sls b/tests/pillar/server_single.sls
index 73b683f..4b77314 100644
--- a/tests/pillar/server_single.sls
+++ b/tests/pillar/server_single.sls
@@ -8,6 +8,7 @@
       name: heat_domain_admin
       password: password
       domain: heat
+    stack_action_timeout: 7200
     bind:
       api_cfn:
         address: 0.0.0.0