diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml
index 79f9343..979be34 100644
--- a/service/files/defaults.yaml
+++ b/service/files/defaults.yaml
@@ -1,6 +1,7 @@
 configs:
   sahara:
     debug: false
+    enable_wait_condition: false
     port:
       cont: 8386
       ingress: data-processing
diff --git a/service/files/sahara.conf.j2 b/service/files/sahara.conf.j2
index 2a657df..22180c1 100644
--- a/service/files/sahara.conf.j2
+++ b/service/files/sahara.conf.j2
@@ -13,6 +13,8 @@ port = {{ sahara.port.cont }}
 periodic_coordinator_backend_url = memcached://{{ address("memcached", memcached.port) }}
 transport_url = rabbit://{{ rabbitmq.user }}:{{ rabbitmq.password }}@{{ address("rabbitmq", rabbitmq.port) }}/
 
+heat_enable_wait_condition = {{ sahara.enable_wait_condition }}
+
 [database]
 connection = mysql+pymysql://{{ sahara.db.username }}:{{ sahara.db.password }}@{{ address(service.database) }}/{{ sahara.db.name }}
 max_retries = -1