diff --git a/muranoclient/common/yaqlexpression.py b/muranoclient/common/yaqlexpression.py
index 1f768543..c9b19e8b 100644
--- a/muranoclient/common/yaqlexpression.py
+++ b/muranoclient/common/yaqlexpression.py
@@ -20,8 +20,9 @@ from yaql.language import exceptions as yaql_exc
 
 def _set_up_yaql():
     legacy_engine_options = {
-        'yaql.limitIterators': 100,
-        'yaql.memoryQuota': 20000}
+        'yaql.limitIterators': 10000,
+        'yaql.memoryQuota': 1000000
+    }
     return yaql.YaqlFactory().create(options=legacy_engine_options)
 
 YAQL = _set_up_yaql()