diff --git a/murano/engine/yaql_yaml_loader.py b/murano/engine/yaql_yaml_loader.py
index 87bee560..bd3a738e 100644
--- a/murano/engine/yaql_yaml_loader.py
+++ b/murano/engine/yaql_yaml_loader.py
@@ -65,6 +65,6 @@ def yaql_constructor(loader, node):
     result.source_file_position = build_position(node)
     return result
 
-yaml.add_constructor(u'!yaql', yaql_constructor, YaqlYamlLoader)
-yaml.add_implicit_resolver(u'!yaql', yaql_expression.YaqlExpression,
-                           Loader=YaqlYamlLoader)
+YaqlYamlLoader.add_constructor(u'!yaql', yaql_constructor)
+YaqlYamlLoader.add_implicit_resolver(u'!yaql', yaql_expression.YaqlExpression,
+                                     None)