diff --git a/classes/cluster_deprecated/model-manager/infra/config.yml b/classes/cluster/model-manager/infra/config.yml
similarity index 100%
rename from classes/cluster_deprecated/model-manager/infra/config.yml
rename to classes/cluster/model-manager/infra/config.yml
diff --git a/classes/cluster_deprecated/model-manager/infra/init.yml b/classes/cluster/model-manager/infra/init.yml
similarity index 100%
rename from classes/cluster_deprecated/model-manager/infra/init.yml
rename to classes/cluster/model-manager/infra/init.yml
diff --git a/classes/cluster_deprecated/model-manager/init.yml b/classes/cluster/model-manager/init.yml
similarity index 100%
rename from classes/cluster_deprecated/model-manager/init.yml
rename to classes/cluster/model-manager/init.yml
diff --git a/classes/cluster_deprecated/model-manager/model_manager/dashboard.yml b/classes/cluster/model-manager/model_manager/dashboard.yml
similarity index 100%
rename from classes/cluster_deprecated/model-manager/model_manager/dashboard.yml
rename to classes/cluster/model-manager/model_manager/dashboard.yml
diff --git a/classes/cluster_deprecated/model-manager/model_manager/identity.yml b/classes/cluster/model-manager/model_manager/identity.yml
similarity index 100%
rename from classes/cluster_deprecated/model-manager/model_manager/identity.yml
rename to classes/cluster/model-manager/model_manager/identity.yml
diff --git a/classes/cluster_deprecated/model-manager/model_manager/init.yml b/classes/cluster/model-manager/model_manager/init.yml
similarity index 62%
rename from classes/cluster_deprecated/model-manager/model_manager/init.yml
rename to classes/cluster/model-manager/model_manager/init.yml
index 781d1f4..9246c62 100644
--- a/classes/cluster_deprecated/model-manager/model_manager/init.yml
+++ b/classes/cluster/model-manager/model_manager/init.yml
@@ -9,8 +9,17 @@
     model_manager_jenkins_host: ci.mcp.mirantis.net
     model_manager_jenkins_user: model-manager
     model_manager_jenkins_password: 't&2FLaB]2!'
-    model_manager_template_url: https://gerrit.mcp.mirantis.net/gitweb?p=mk/cookiecutter-templates.git;a=blob_plain;f=workflow_definition.yml;hb=HEAD
+    model_manager_template_remote: gerrit
+    model_manager_template_url: https://gerrit.mcp.mirantis.net
     model_manager_template_job: generate-salt-model-separated-products
+    model_manager_template_project_name: mk%2Fcookiecutter-templates
+    model_manager_template_file_name: workflow_definition.yml
+    model_manager_template_username: model-manager
+    model_manager_template_password: 'IAK5G4xB9XvTHuQWTaDa6c2+sXwjDaPzTIy3o3Di1A'
+    model_manager_template_versioning_enabled: true
+    model_manager_template_version_filter: '^(?!mcp0\.5$|mcp1\.0|mcp1\.1$).*'
+    model_manager_template_version_map:
+      master: nightly
     # identity params
     openstack_region: RegionOne
     admin_email: root@localhost
diff --git a/classes/cluster_deprecated/model-manager/model_manager/proxy.yml b/classes/cluster/model-manager/model_manager/proxy.yml
similarity index 100%
rename from classes/cluster_deprecated/model-manager/model_manager/proxy.yml
rename to classes/cluster/model-manager/model_manager/proxy.yml