diff --git a/murano-apps/Gerrit/package/Classes/Gerrit.yaml b/murano-apps/Gerrit/package/Classes/Gerrit.yaml
index 31954bb..54ede09 100644
--- a/murano-apps/Gerrit/package/Classes/Gerrit.yaml
+++ b/murano-apps/Gerrit/package/Classes/Gerrit.yaml
@@ -212,7 +212,7 @@ Methods:
       - $linux: new(conf:Linux)
       - $resource: new(sys:Resources)
 
-      - $script: $resource.string('create_gerrit_labels.sh')
+      - $script: $resource.string('scripts/create_gerrit_labels.sh')
       - $linux.runCommand($.instance.agent, $script)
       - $._environment.reporter.report($this, 'Label "Verified" is successfully created.')
 
diff --git a/murano-apps/Gerrit/package/Resources/create_gerrit_labels.sh b/murano-apps/Gerrit/package/Resources/scripts/create_gerrit_labels.sh
similarity index 100%
rename from murano-apps/Gerrit/package/Resources/create_gerrit_labels.sh
rename to murano-apps/Gerrit/package/Resources/scripts/create_gerrit_labels.sh
diff --git a/murano-apps/Nodepool/package/Classes/Nodepool.yaml b/murano-apps/Nodepool/package/Classes/Nodepool.yaml
index 0d150bc..4f8bc4a 100644
--- a/murano-apps/Nodepool/package/Classes/Nodepool.yaml
+++ b/murano-apps/Nodepool/package/Classes/Nodepool.yaml
@@ -94,7 +94,7 @@ Methods:
           "%USERNAME%": $.jenkins.ldap.ldapRootUser
           "%PASSWORD%": $.jenkins.ldap.ldapRootPass
           "%JENKINS_HOST%": $jenkinsHost
-      - $script: $resource.string('get_api_token.sh').replace($replacements)
+      - $script: $resource.string('scripts/get_api_token.sh').replace($replacements)
       - $apiKey: $linux.runCommand($.instance.agent, $script).stdout
       - $credentialsId: $.jenkins.configureCredentials()
 
diff --git a/murano-apps/Nodepool/package/Resources/get_api_token.sh b/murano-apps/Nodepool/package/Resources/scripts/get_api_token.sh
similarity index 100%
rename from murano-apps/Nodepool/package/Resources/get_api_token.sh
rename to murano-apps/Nodepool/package/Resources/scripts/get_api_token.sh
diff --git a/murano-apps/Zuul/package/Classes/Zuul.yaml b/murano-apps/Zuul/package/Classes/Zuul.yaml
index 8900543..6446274 100644
--- a/murano-apps/Zuul/package/Classes/Zuul.yaml
+++ b/murano-apps/Zuul/package/Classes/Zuul.yaml
@@ -97,7 +97,7 @@ Methods:
     Body:
       - $resources: new(sys:Resources)
       - $linux: new(conf:Linux)
-      - $script: $resources.string('switch_to_local_project_config.sh')
+      - $script: $resources.string('scripts/switch_to_local_project_config.sh')
       - $._environment.reporter.report($this, '[Zuul] Switching to project-config from installed Gerrit...')
       - $projectConfigURL: format(
           'ssh://{0}@{1}:29418/open-paas/project-config', 
@@ -111,11 +111,11 @@ Methods:
     Body:
      - $resources: new(sys:Resources)
      - $linux: new(conf:Linux)
-     - $script: $resources.string('update_layout.sh')
+     - $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('update_layout.pp')
+     - $manifest: $resources.string('scripts/update_layout.pp')
      - $this.instance.applyManifest($manifest, 60)
 
   destroy:
diff --git a/murano-apps/Zuul/package/Resources/switch_to_local_project_config.sh b/murano-apps/Zuul/package/Resources/scripts/switch_to_local_project_config.sh
similarity index 100%
rename from murano-apps/Zuul/package/Resources/switch_to_local_project_config.sh
rename to murano-apps/Zuul/package/Resources/scripts/switch_to_local_project_config.sh
diff --git a/murano-apps/Zuul/package/Resources/update_layout.pp b/murano-apps/Zuul/package/Resources/scripts/update_layout.pp
similarity index 100%
rename from murano-apps/Zuul/package/Resources/update_layout.pp
rename to murano-apps/Zuul/package/Resources/scripts/update_layout.pp
diff --git a/murano-apps/Zuul/package/Resources/update_layout.sh b/murano-apps/Zuul/package/Resources/scripts/update_layout.sh
similarity index 100%
rename from murano-apps/Zuul/package/Resources/update_layout.sh
rename to murano-apps/Zuul/package/Resources/scripts/update_layout.sh