diff --git a/murano-apps/Gerrit/package/Classes/Gerrit.yaml b/murano-apps/Gerrit/package/Classes/Gerrit.yaml
index 0f5e1b6..dab575d 100644
--- a/murano-apps/Gerrit/package/Classes/Gerrit.yaml
+++ b/murano-apps/Gerrit/package/Classes/Gerrit.yaml
@@ -38,22 +38,22 @@ Methods:
           Return:
 
       - $securityGroupIngress:
-        - ToPort: 80
-          FromPort: 80
-          IpProtocol: tcp
-          External: true
-        - ToPort: 443
-          FromPort: 443
-          IpProtocol: tcp
-          External: true
-        - ToPort: 8081
-          FromPort: 8081
-          IpProtocol: tcp
-          External: true
-        - ToPort: 29418
-          FromPort: 29418
-          IpProtocol: tcp
-          External: true
+          - ToPort: 80
+            FromPort: 80
+            IpProtocol: tcp
+            External: true
+          - ToPort: 443
+            FromPort: 443
+            IpProtocol: tcp
+            External: true
+          - ToPort: 8081
+            FromPort: 8081
+            IpProtocol: tcp
+            External: true
+          - ToPort: 29418
+            FromPort: 29418
+            IpProtocol: tcp
+            External: true
 
       - $._environment.securityGroupManager.addGroupIngress($securityGroupIngress)
       - $._environment.reporter.report($this, 'Creating VM for Gerrit "{0}"'.format($.instance.name))
diff --git a/murano-apps/Jenkins/package/manifest.yaml b/murano-apps/Jenkins/package/manifest.yaml
index e769efa..6d0a80a 100644
--- a/murano-apps/Jenkins/package/manifest.yaml
+++ b/murano-apps/Jenkins/package/manifest.yaml
@@ -8,7 +8,7 @@ Description: |
 Author: 'Mirantis, Inc'
 Tags: [Server, Java, CI, Jenkins]
 Classes:
- org.openstack.ci_cd_pipeline_murano_app.Jenkins: Jenkins.yaml
+  org.openstack.ci_cd_pipeline_murano_app.Jenkins: Jenkins.yaml
 UI: ui.yaml
 Logo: logo.png
 Require:
diff --git a/murano-apps/Nodepool/package/manifest.yaml b/murano-apps/Nodepool/package/manifest.yaml
index a48911c..facbf78 100644
--- a/murano-apps/Nodepool/package/manifest.yaml
+++ b/murano-apps/Nodepool/package/manifest.yaml
@@ -10,7 +10,7 @@ Description: |
 Author: 'Mirantis, Inc'
 Tags: [Images, CI, Zuul, Jenkins]
 Classes:
- org.openstack.ci_cd_pipeline_murano_app.Nodepool: Nodepool.yaml
+  org.openstack.ci_cd_pipeline_murano_app.Nodepool: Nodepool.yaml
 UI: ui.yaml
 Logo: logo.png
 Require:
diff --git a/murano-apps/OpenLDAP/package/manifest.yaml b/murano-apps/OpenLDAP/package/manifest.yaml
index 5240d4c..4279492 100644
--- a/murano-apps/OpenLDAP/package/manifest.yaml
+++ b/murano-apps/OpenLDAP/package/manifest.yaml
@@ -8,7 +8,7 @@ Description: |
 Author: 'Mirantis, Inc'
 Tags: [Server, LDAP]
 Classes:
- org.openstack.ci_cd_pipeline_murano_app.OpenLDAP: OpenLDAP.yaml
+  org.openstack.ci_cd_pipeline_murano_app.OpenLDAP: OpenLDAP.yaml
 UI: ui.yaml
 Logo: logo.png
 Require:
diff --git a/murano-apps/Puppet/package/Classes/Hiera.yaml b/murano-apps/Puppet/package/Classes/Hiera.yaml
index 00ba640..6440332 100644
--- a/murano-apps/Puppet/package/Classes/Hiera.yaml
+++ b/murano-apps/Puppet/package/Classes/Hiera.yaml
@@ -11,7 +11,7 @@
 #  under the License.
 
 Namespaces:
-    =: org.openstack.ci_cd_pipeline_murano_app.puppet
+  =: org.openstack.ci_cd_pipeline_murano_app.puppet
 
 Name: Hiera
 
diff --git a/murano-apps/Puppet/package/Classes/PuppetClient.yaml b/murano-apps/Puppet/package/Classes/PuppetClient.yaml
index c39050d..cdc69d3 100644
--- a/murano-apps/Puppet/package/Classes/PuppetClient.yaml
+++ b/murano-apps/Puppet/package/Classes/PuppetClient.yaml
@@ -11,9 +11,9 @@
 #  under the License.
 
 Namespaces:
-    =: org.openstack.ci_cd_pipeline_murano_app.puppet
-    conf: io.murano.configuration
-    sys: io.murano.system
+  =: org.openstack.ci_cd_pipeline_murano_app.puppet
+  conf: io.murano.configuration
+  sys: io.murano.system
 
 Name: PuppetClient
 
diff --git a/murano-apps/Puppet/package/Classes/PuppetInstance.yaml b/murano-apps/Puppet/package/Classes/PuppetInstance.yaml
index 45a9b13..acd1659 100644
--- a/murano-apps/Puppet/package/Classes/PuppetInstance.yaml
+++ b/murano-apps/Puppet/package/Classes/PuppetInstance.yaml
@@ -11,10 +11,10 @@
 #  under the License.
 
 Namespaces:
-    =: org.openstack.ci_cd_pipeline_murano_app.puppet
-    res: io.murano.resources
-    std: io.murano
-    sys: io.murano.system
+  =: org.openstack.ci_cd_pipeline_murano_app.puppet
+  res: io.murano.resources
+  std: io.murano
+  sys: io.murano.system
 
 Name: PuppetInstance
 
@@ -22,7 +22,7 @@ Extends: res:LinuxMuranoInstance
 
 Properties:
   hiera:
-   Contract: $.class(Hiera)
+    Contract: $.class(Hiera)
 
 Methods:
   .init:
diff --git a/murano-apps/Puppet/package/Classes/PuppetServer.yaml b/murano-apps/Puppet/package/Classes/PuppetServer.yaml
index e6beaae..d5c09e6 100644
--- a/murano-apps/Puppet/package/Classes/PuppetServer.yaml
+++ b/murano-apps/Puppet/package/Classes/PuppetServer.yaml
@@ -11,10 +11,10 @@
 #  under the License.
 
 Namespaces:
-    =: org.openstack.ci_cd_pipeline_murano_app.puppet
-    conf: io.murano.configuration
-    sys: io.murano.system
-    net: org.openstack.ci_cd_pipeline_murano_app.puppet.net
+  =: org.openstack.ci_cd_pipeline_murano_app.puppet
+  conf: io.murano.configuration
+  sys: io.murano.system
+  net: org.openstack.ci_cd_pipeline_murano_app.puppet.net
 
 Name: PuppetServer
 
@@ -101,9 +101,9 @@ Methods:
   _installPuppetModules:
     Body:
       - $modules:
-        - 'puppetlabs-vcsrepo'
-        - 'theforeman-git'
-        - 'theforeman-puppet'
+          - 'puppetlabs-vcsrepo'
+          - 'theforeman-git'
+          - 'theforeman-puppet'
 
       - $this.clients.select($.instance).append($this.masterInstance).selectMany(
             let(x => $) -> $modules.select(
diff --git a/murano-apps/Puppet/package/Classes/YamlFile.yaml b/murano-apps/Puppet/package/Classes/YamlFile.yaml
index d4dd992..b98aac2 100644
--- a/murano-apps/Puppet/package/Classes/YamlFile.yaml
+++ b/murano-apps/Puppet/package/Classes/YamlFile.yaml
@@ -11,7 +11,7 @@
 #  under the License.
 
 Namespaces:
-    =: org.openstack.ci_cd_pipeline_murano_app.puppet
+  =: org.openstack.ci_cd_pipeline_murano_app.puppet
 
 Name: YamlFile
 
diff --git a/murano-apps/Puppet/package/Classes/YamlTool.yaml b/murano-apps/Puppet/package/Classes/YamlTool.yaml
index 4cbb20c..b4ada50 100644
--- a/murano-apps/Puppet/package/Classes/YamlTool.yaml
+++ b/murano-apps/Puppet/package/Classes/YamlTool.yaml
@@ -12,9 +12,9 @@
 
 # TODO: Make every method of this class static when moving to Mitaka
 Namespaces:
-    =: org.openstack.ci_cd_pipeline_murano_app.puppet
-    res: io.murano.resources
-    sys: io.murano.system
+  =: org.openstack.ci_cd_pipeline_murano_app.puppet
+  res: io.murano.resources
+  sys: io.murano.system
 
 Name: YamlTool
 
diff --git a/murano-apps/Puppet/package/Classes/net/Hosts.yaml b/murano-apps/Puppet/package/Classes/net/Hosts.yaml
index 24a3c52..77b3066 100644
--- a/murano-apps/Puppet/package/Classes/net/Hosts.yaml
+++ b/murano-apps/Puppet/package/Classes/net/Hosts.yaml
@@ -40,7 +40,7 @@ Methods:
   addHostByInstance:
     Arguments:
       - instance:
-         Contract: $.class(res:LinuxMuranoInstance).notNull()
+          Contract: $.class(res:LinuxMuranoInstance).notNull()
       - aliases:
           Contract:
             - $.string()
@@ -57,17 +57,17 @@ Methods:
   #
   getHostName:
     Arguments:
-     - instance:
-         Contract: $.class(res:LinuxMuranoInstance).notNull()
-     - fqdn:
-         Contract: $.bool().notNull()
-         Default: false
+      - instance:
+          Contract: $.class(res:LinuxMuranoInstance).notNull()
+      - fqdn:
+          Contract: $.bool().notNull()
+          Default: false
     Body:
       - $linux: new(conf:Linux)
 
       - If: $fqdn
         Then:
-        - Return: $linux.runCommand($instance.agent, 'hostname -f').stdout
+          - Return: $linux.runCommand($instance.agent, 'hostname -f').stdout
 
       - Return: $linux.runCommand($instance.agent, 'hostname -s').stdout
 
diff --git a/murano-apps/Puppet/package/Resources/scripts/install/hiera.yaml b/murano-apps/Puppet/package/Resources/scripts/install/hiera.yaml
index 513f44f..8678731 100644
--- a/murano-apps/Puppet/package/Resources/scripts/install/hiera.yaml
+++ b/murano-apps/Puppet/package/Resources/scripts/install/hiera.yaml
@@ -7,4 +7,4 @@
   - murano
 
 :yaml:
-   :datadir: /etc/puppet/hieradata
+  :datadir: /etc/puppet/hieradata
diff --git a/murano-apps/SystemConfig/package/manifest.yaml b/murano-apps/SystemConfig/package/manifest.yaml
index dfaf668..ca1946a 100644
--- a/murano-apps/SystemConfig/package/manifest.yaml
+++ b/murano-apps/SystemConfig/package/manifest.yaml
@@ -8,7 +8,7 @@ Description: |
 Author: 'Mirantis, Inc'
 Tags: [CI]
 Classes:
- org.openstack.ci_cd_pipeline_murano_app.puppet.SystemConfig: SystemConfig.yaml
+  org.openstack.ci_cd_pipeline_murano_app.puppet.SystemConfig: SystemConfig.yaml
 UI: ui.yaml
 Logo: logo.png
 Require:
diff --git a/murano-apps/Zuul/package/Classes/Zuul.yaml b/murano-apps/Zuul/package/Classes/Zuul.yaml
index 1296a76..6f0f784 100644
--- a/murano-apps/Zuul/package/Classes/Zuul.yaml
+++ b/murano-apps/Zuul/package/Classes/Zuul.yaml
@@ -116,14 +116,14 @@ Methods:
 
   _createPeriodicLayoutUpdate:
     Body:
-     - $resources: new(sys:Resources)
-     - $linux: new(conf:Linux)
-     - $script: $resources.string('scripts/update_layout.sh')
-     - $._environment.reporter.report($this, '[Zuul] Creating autoupdating layout.yaml file...')
-     - $linux.putFile($.instance.agent, $script, '/usr/local/bin/update_layout.sh')
+      - $resources: new(sys:Resources)
+      - $linux: new(conf:Linux)
+      - $script: $resources.string('scripts/update_layout.sh')
+      - $._environment.reporter.report($this, '[Zuul] Creating autoupdating layout.yaml file...')
+      - $linux.putFile($.instance.agent, $script, '/usr/local/bin/update_layout.sh')
 
-     - $manifest: $resources.string('scripts/update_layout.pp')
-     - $this.instance.applyManifest($manifest, 60)
+      - $manifest: $resources.string('scripts/update_layout.pp')
+      - $this.instance.applyManifest($manifest, 60)
 
   destroy:
     Body:
diff --git a/murano-apps/Zuul/package/manifest.yaml b/murano-apps/Zuul/package/manifest.yaml
index c4fd52a..c4417fb 100644
--- a/murano-apps/Zuul/package/manifest.yaml
+++ b/murano-apps/Zuul/package/manifest.yaml
@@ -7,7 +7,7 @@ Description: |
 Author: 'Mirantis, Inc'
 Tags: [CI, Zuul]
 Classes:
- org.openstack.ci_cd_pipeline_murano_app.Zuul: Zuul.yaml
+  org.openstack.ci_cd_pipeline_murano_app.Zuul: Zuul.yaml
 UI: ui.yaml
 Require:
   org.openstack.ci_cd_pipeline_murano_app.puppet.Puppet: