diff --git a/murano-apps/Gerrit/package/Classes/Gerrit.yaml b/murano-apps/Gerrit/package/Classes/Gerrit.yaml
index 3d2788e..c59718b 100644
--- a/murano-apps/Gerrit/package/Classes/Gerrit.yaml
+++ b/murano-apps/Gerrit/package/Classes/Gerrit.yaml
@@ -103,7 +103,7 @@ Methods:
   #
   getProjectConfigRepo:
     Body:
-      - Return: !yaql "format('https://{0}/open-paas/project-config', $this.instance.ipAddresses[0])"
+      - Return: format('https://{0}/open-paas/project-config', $this.instance.ipAddresses[0])
 
   #
   # Switch to newly created project-config repo
diff --git a/murano-apps/Puppet/package/Classes/Hiera.yaml b/murano-apps/Puppet/package/Classes/Hiera.yaml
index fa4ab58..00ba640 100644
--- a/murano-apps/Puppet/package/Classes/Hiera.yaml
+++ b/murano-apps/Puppet/package/Classes/Hiera.yaml
@@ -36,7 +36,7 @@ Methods:
       - $this.dataFile: new(YamlFile, path => $this.dataFilePath)
       # add new data file to hiera
       # this file is the only file to store all of data the passed throw Hiera class
-      - $config: !yaql "dict( ':hierarchy' => 'murano')"
+      - $config: dict(':hierarchy' => 'murano')
       - $this.configFile.putData($config)
 
   putData: