diff --git a/lib/heat b/lib/heat
index 58505ab792..ef134ec0f4 100644
--- a/lib/heat
+++ b/lib/heat
@@ -121,6 +121,9 @@ function configure_heat() {
     iniset $HEAT_CONF heat_api_cloudwatch bind_host $HEAT_API_CW_HOST
     iniset $HEAT_CONF heat_api_cloudwatch bind_port $HEAT_API_CW_PORT
 
+    # Set limits to match tempest defaults
+    iniset $HEAT_CONF max_template_size 10240
+
     # heat environment
     sudo mkdir -p $HEAT_ENV_DIR
     sudo chown $STACK_USER $HEAT_ENV_DIR