diff --git a/ecs-service.cfndsl.rb b/ecs-service.cfndsl.rb
index 902d47f..1e3210b 100644
--- a/ecs-service.cfndsl.rb
+++ b/ecs-service.cfndsl.rb
@@ -62,6 +62,9 @@
     task_def.merge!({ Cpu: task['cpu'] }) if task.has_key?('cpu')
 
     task_def.merge!({ Ulimits: task['ulimits'] }) if task.has_key?('ulimits')
+    
+    task_def.merge!({ StartTimeout: task['start_timeout'] }) if task.has_key?('start_timeout')
+    task_def.merge!({ StopTimeout: task['stop_timeout'] }) if task.has_key?('stop_timeout')