diff --git a/aptly/server/mirror/debian/cassandra.yml b/aptly/server/mirror/debian/cassandra.yml
index bd8388b..e7aaf4f 100644
--- a/aptly/server/mirror/debian/cassandra.yml
+++ b/aptly/server/mirror/debian/cassandra.yml
@@ -20,5 +20,5 @@
           publisher:
             component: extra
             distributions:
-              - ubuntu-trusty/${_param:apt_mk_version}
-              - ubuntu-xenial/${_param:apt_mk_version}
+              - ubuntu-trusty/${_param:mcp_version}
+              - ubuntu-xenial/${_param:mcp_version}
diff --git a/aptly/server/mirror/debian/elasticsearch.yml b/aptly/server/mirror/debian/elasticsearch.yml
index f61885b..1085762 100644
--- a/aptly/server/mirror/debian/elasticsearch.yml
+++ b/aptly/server/mirror/debian/elasticsearch.yml
@@ -32,8 +32,8 @@
           publisher:
             component: elastic
             distributions:
-              - trusty/${_param:apt_mk_version}
-              - xenial/${_param:apt_mk_version}
+              - trusty/${_param:mcp_version}
+              - xenial/${_param:mcp_version}
         kibana:
           source: ${_param:mirror_kibana_source}
           distribution: ${_param:mirror_kibana_distribution}
@@ -43,8 +43,8 @@
           publisher:
             component: elastic
             distributions:
-              - trusty/${_param:apt_mk_version}
-              - xenial/${_param:apt_mk_version}
+              - trusty/${_param:mcp_version}
+              - xenial/${_param:mcp_version}
         kibana-46:
           source: ${_param:mirror_kibana-46_source}
           distribution: ${_param:mirror_kibana-46_distribution}
@@ -54,8 +54,8 @@
           publisher:
             component: elastic
             distributions:
-              - trusty/${_param:apt_mk_version}
-              - xenial/${_param:apt_mk_version}
+              - trusty/${_param:mcp_version}
+              - xenial/${_param:mcp_version}
         elasticsearch-curator:
           source: ${_param:mirror_elasticsearch-curator_source}
           distribution: ${_param:mirror_elasticsearch-curator_distribution}
@@ -65,5 +65,5 @@
           publisher:
             component: elastic
             distributions:
-              - trusty/${_param:apt_mk_version}
-              - xenial/${_param:apt_mk_version}
+              - trusty/${_param:mcp_version}
+              - xenial/${_param:mcp_version}
diff --git a/aptly/server/mirror/debian/elasticsearch5.yml b/aptly/server/mirror/debian/elasticsearch5.yml
index 75368ba..0157df2 100644
--- a/aptly/server/mirror/debian/elasticsearch5.yml
+++ b/aptly/server/mirror/debian/elasticsearch5.yml
@@ -20,8 +20,8 @@
           publisher:
             component: elastic
             distributions:
-              - trusty/${_param:apt_mk_version}
-              - xenial/${_param:apt_mk_version}
+              - trusty/${_param:mcp_version}
+              - xenial/${_param:mcp_version}
         kibana-5x:
           source: ${_param:aptly_mirror_elasticsearch-5x_source}
           distribution: ${_param:aptly_mirror_elasticsearch-5x_distribution}
@@ -31,8 +31,8 @@
           publisher:
             component: elastic
             distributions:
-              - trusty/${_param:apt_mk_version}
-              - xenial/${_param:apt_mk_version}
+              - trusty/${_param:mcp_version}
+              - xenial/${_param:mcp_version}
         elasticsearch-curator-5x:
           source: ${_param:aptly_mirror_elasticsearch-curator-5x_source}
           distribution: ${_param:aptly_mirror_elasticsearch-curator-5x_distribution}
@@ -42,5 +42,5 @@
           publisher:
             component: elastic
             distributions:
-              - trusty/${_param:apt_mk_version}
-              - xenial/${_param:apt_mk_version}
+              - trusty/${_param:mcp_version}
+              - xenial/${_param:mcp_version}
diff --git a/aptly/server/mirror/debian/sensu.yml b/aptly/server/mirror/debian/sensu.yml
index 7b4d535..ed0eb76 100644
--- a/aptly/server/mirror/debian/sensu.yml
+++ b/aptly/server/mirror/debian/sensu.yml
@@ -17,5 +17,5 @@
           publisher:
             component: sensu
             distributions:
-              - ubuntu-trusty/${_param:apt_mk_version}
-              - ubuntu-xenial/${_param:apt_mk_version}
\ No newline at end of file
+              - ubuntu-trusty/${_param:mcp_version}
+              - ubuntu-xenial/${_param:mcp_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/ceph.yml b/aptly/server/mirror/ubuntu/trusty/ceph.yml
index 0c587d4..dd89229 100644
--- a/aptly/server/mirror/ubuntu/trusty/ceph.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ceph.yml
@@ -18,4 +18,4 @@
           publisher:
             component: ceph
             distributions:
-              - ubuntu-trusty/${_param:apt_mk_version}
+              - ubuntu-trusty/${_param:mcp_version}
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/cassandra.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/cassandra.yml
index b2b7a42..dfe8992 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/cassandra.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/cassandra.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    mirror_mirantis_openstack_trusty_cassandra_source: http://mirror.mirantis.com/${_param:apt_mk_version}/cassandra/trusty/
+    mirror_mirantis_openstack_trusty_cassandra_source: http://mirror.mirantis.com/${_param:mcp_version}/cassandra/trusty/
     mirror_mirantis_openstack_trusty_cassandra_distribution: 21x
     mirror_mirantis_openstack_trusty_cassandra_components: main
     mirror_mirantis_openstack_trusty_cassandra_gpgkeys:
@@ -20,4 +20,4 @@
           publisher:
             component: 21x
             distributions:
-              - ubuntu-trusty/cassandra/${_param:apt_mk_version}
\ No newline at end of file
+              - ubuntu-trusty/cassandra/${_param:mcp_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/extra.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/extra.yml
index c4cbbe8..81b8dd5 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/extra.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/extra.yml
@@ -1,7 +1,7 @@
 parameters:
   _param:
     mirror_mirantis_openstack_trusty_extra_source: http://apt.mirantis.com/trusty/
-    mirror_mirantis_openstack_trusty_extra_distribution: ${_param:apt_mk_version}
+    mirror_mirantis_openstack_trusty_extra_distribution: ${_param:mcp_version}
     mirror_mirantis_openstack_trusty_extra_components: extra
     mirror_mirantis_openstack_trusty_extra_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mirantis_openstack_trusty_extra_gpgkeys:
@@ -19,4 +19,4 @@
           publisher:
             component: extra
             distributions:
-              - ubuntu-trusty/${_param:apt_mk_version}
\ No newline at end of file
+              - ubuntu-trusty/${_param:mcp_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/fluentd.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/fluentd.yml
index c396402..efe0032 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/fluentd.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/fluentd.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    mirror_mirantis_openstack_trusty_fluentd_source: http://mirror.mirantis.com/${_param:apt_mk_version}/td-agent/trusty
+    mirror_mirantis_openstack_trusty_fluentd_source: http://mirror.mirantis.com/${_param:mcp_version}/td-agent/trusty
     mirror_mirantis_openstack_trusty_fluentd_distribution: trusty
     mirror_mirantis_openstack_trusty_fluentd_components: contrib
     mirror_mirantis_openstack_trusty_fluentd_gpgkeys:
@@ -17,4 +17,4 @@
           publisher:
             component: contrib
             distributions:
-              - ubuntu-trusty/fluentd/${_param:apt_mk_version}
+              - ubuntu-trusty/fluentd/${_param:mcp_version}
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/grafana.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/grafana.yml
index a9821cc..f830912 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/grafana.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/grafana.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    mirror_mirantis_openstack_trusty_grafana_source: http://mirror.mirantis.com/${_param:apt_mk_version}/grafana/trusty/
+    mirror_mirantis_openstack_trusty_grafana_source: http://mirror.mirantis.com/${_param:mcp_version}/grafana/trusty/
     mirror_mirantis_openstack_trusty_grafana_distribution: jessie
     mirror_mirantis_openstack_trusty_grafana_components: main
     mirror_mirantis_openstack_trusty_grafana_gpgkeys:
@@ -17,4 +17,4 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-trusty/grafana/${_param:apt_mk_version}
\ No newline at end of file
+              - ubuntu-trusty/grafana/${_param:mcp_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/mitaka.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/mitaka.yml
index 49adf59..66ee76c 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/mitaka.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/mitaka.yml
@@ -1,7 +1,7 @@
 parameters:
   _param:
     mirror_mk_openstack_xenial_mitaka_source: http://apt.mirantis.com/trusty/
-    mirror_mk_openstack_xenial_mitaka_distribution: ${_param:apt_mk_version}
+    mirror_mk_openstack_xenial_mitaka_distribution: ${_param:mcp_version}
     mirror_mk_openstack_xenial_mitaka_components: mitaka
     mirror_mk_openstack_xenial_mitaka_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mk_openstack_xenial_mitaka_gpgkeys:
@@ -19,4 +19,4 @@
           publisher:
             component: mitaka
             distributions:
-              - ubuntu-trusty/${_param:apt_mk_version}
\ No newline at end of file
+              - ubuntu-trusty/${_param:mcp_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc31.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc31.yml
index 44c9f8d..a0c9709 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc31.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc31.yml
@@ -1,7 +1,7 @@
 parameters:
   _param:
     mirror_mcp_opencontrail_trusty_oc31_source: http://apt.mirantis.com/trusty/
-    mirror_mcp_opencontrail_trusty_oc31_distribution: ${_param:apt_mk_version}
+    mirror_mcp_opencontrail_trusty_oc31_distribution: ${_param:mcp_version}
     mirror_mcp_opencontrail_trusty_oc31_components: oc31
     mirror_mcp_opencontrail_trusty_oc31_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mcp_opencontrail_trusty_oc31_gpgkeys:
@@ -19,4 +19,4 @@
           publisher:
             component: oc31
             distributions:
-              - ubuntu-trusty/${_param:apt_mk_version}
\ No newline at end of file
+              - ubuntu-trusty/${_param:mcp_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc311.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc311.yml
index 08f8e48..fde8fba 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc311.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc311.yml
@@ -1,7 +1,7 @@
 parameters:
   _param:
     mirror_mcp_opencontrail_trusty_oc311_source: http://apt.mirantis.com/trusty/
-    mirror_mcp_opencontrail_trusty_oc311_distribution: ${_param:apt_mk_version}
+    mirror_mcp_opencontrail_trusty_oc311_distribution: ${_param:mcp_version}
     mirror_mcp_opencontrail_trusty_oc311_components: oc311
     mirror_mcp_opencontrail_trusty_oc311_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mcp_opencontrail_trusty_oc311_gpgkeys:
@@ -19,4 +19,4 @@
           publisher:
             component: oc311
             distributions:
-              - ubuntu-trusty/${_param:apt_mk_version}
\ No newline at end of file
+              - ubuntu-trusty/${_param:mcp_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc32.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc32.yml
index 44051ce..4e98fdd 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc32.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc32.yml
@@ -1,7 +1,7 @@
 parameters:
   _param:
     mirror_mcp_opencontrail_trusty_oc32_source: http://apt.mirantis.com/trusty/
-    mirror_mcp_opencontrail_trusty_oc32_distribution: ${_param:apt_mk_version}
+    mirror_mcp_opencontrail_trusty_oc32_distribution: ${_param:mcp_version}
     mirror_mcp_opencontrail_trusty_oc32_components: oc32
     mirror_mcp_opencontrail_trusty_oc32_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mcp_opencontrail_trusty_oc32_gpgkeys:
@@ -19,4 +19,4 @@
           publisher:
             component: oc32
             distributions:
-              - ubuntu-trusty/${_param:apt_mk_version}
\ No newline at end of file
+              - ubuntu-trusty/${_param:mcp_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc323.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc323.yml
index 8b55076..499fa53 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc323.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc323.yml
@@ -1,7 +1,7 @@
 parameters:
   _param:
     mirror_mcp_opencontrail_trusty_oc323_source: http://apt.mirantis.com/trusty/
-    mirror_mcp_opencontrail_trusty_oc323_distribution: ${_param:apt_mk_version}
+    mirror_mcp_opencontrail_trusty_oc323_distribution: ${_param:mcp_version}
     mirror_mcp_opencontrail_trusty_oc323_components: oc323
     mirror_mcp_opencontrail_trusty_oc323_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mcp_opencontrail_trusty_oc323_gpgkeys:
@@ -19,4 +19,4 @@
           publisher:
             component: oc323
             distributions:
-              - ubuntu-trusty/${_param:apt_mk_version}
\ No newline at end of file
+              - ubuntu-trusty/${_param:mcp_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/openstack/mitaka.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/openstack/mitaka.yml
index ab1a7c6..da2b94c 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/openstack/mitaka.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/openstack/mitaka.yml
@@ -2,35 +2,35 @@
   _param:
 
     mirror_mirantis_openstack_mitaka_trusty_source: http://apt.mirantis.com/trusty/openstack/mitaka/
-    mirror_mirantis_openstack_mitaka_trusty_distribution: ${_param:apt_mk_version}
+    mirror_mirantis_openstack_mitaka_trusty_distribution: ${_param:mcp_version}
     mirror_mirantis_openstack_mitaka_trusty_components: main restricted
     mirror_mirantis_openstack_mitaka_trusty_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mirantis_openstack_mitaka_trusty_gpgkeys:
       - A76882D3
 
     mirror_mirantis_openstack_mitaka_hotfix_trusty_source: http://apt.mirantis.com/trusty/openstack/mitaka/hotfix/
-    mirror_mirantis_openstack_mitaka_hotfix_trusty_distribution: ${_param:apt_mk_version}
+    mirror_mirantis_openstack_mitaka_hotfix_trusty_distribution: ${_param:mcp_version}
     mirror_mirantis_openstack_mitaka_hotfix_trusty_components: main restricted
     mirror_mirantis_openstack_mitaka_hotfix_trusty_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mirantis_openstack_mitaka_hotfix_trusty_gpgkeys:
       - A76882D3
 
     mirror_mirantis_openstack_mitaka_security_trusty_source: http://apt.mirantis.com/trusty/openstack/mitaka/security/
-    mirror_mirantis_openstack_mitaka_security_trusty_distribution: ${_param:apt_mk_version}
+    mirror_mirantis_openstack_mitaka_security_trusty_distribution: ${_param:mcp_version}
     mirror_mirantis_openstack_mitaka_security_trusty_components: main restricted
     mirror_mirantis_openstack_mitaka_security_trusty_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mirantis_openstack_mitaka_security_trusty_gpgkeys:
       - A76882D3
 
     mirror_mirantis_openstack_mitaka_updates_trusty_source: http://apt.mirantis.com/trusty/openstack/mitaka/updates/
-    mirror_mirantis_openstack_mitaka_updates_trusty_distribution: ${_param:apt_mk_version}
+    mirror_mirantis_openstack_mitaka_updates_trusty_distribution: ${_param:mcp_version}
     mirror_mirantis_openstack_mitaka_updates_trusty_components: main restricted
     mirror_mirantis_openstack_mitaka_updates_trusty_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mirantis_openstack_mitaka_updates_trusty_gpgkeys:
       - A76882D3
 
     mirror_mirantis_openstack_mitaka_holdback_trusty_source: http://apt.mirantis.com/trusty/openstack/mitaka/holdback/
-    mirror_mirantis_openstack_mitaka_holdback_trusty_distribution: ${_param:apt_mk_version}
+    mirror_mirantis_openstack_mitaka_holdback_trusty_distribution: ${_param:mcp_version}
     mirror_mirantis_openstack_mitaka_holdback_trusty_components: main restricted
     mirror_mirantis_openstack_mitaka_holdback_trusty_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mirantis_openstack_mitaka_holdback_trusty_gpgkeys:
@@ -48,7 +48,7 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-trusty/openstack/mitaka/${_param:apt_mk_version}
+              - ubuntu-trusty/openstack/mitaka/${_param:mcp_version}
 
         mirantis_openstack_mitaka_hotfix_trusty:
           source: ${_param:mirror_mirantis_openstack_mitaka_hotfix_trusty_source}
@@ -60,7 +60,7 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-trusty/openstack/mitaka/hotfix/${_param:apt_mk_version}
+              - ubuntu-trusty/openstack/mitaka/hotfix/${_param:mcp_version}
 
         mirantis_openstack_mitaka_security_trusty:
           source: ${_param:mirror_mirantis_openstack_mitaka_security_trusty_source}
@@ -72,7 +72,7 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-trusty/openstack/mitaka/security/${_param:apt_mk_version}
+              - ubuntu-trusty/openstack/mitaka/security/${_param:mcp_version}
 
         # required for alternative horizon plugins/etc..
         mirantis_openstack_mitaka_updates_trusty:
@@ -85,7 +85,7 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-trusty/openstack/mitaka/updates/${_param:apt_mk_version}
+              - ubuntu-trusty/openstack/mitaka/updates/${_param:mcp_version}
 
         # required for salt formulas
         mirantis_openstack_mitaka_holdback_trusty:
@@ -98,5 +98,5 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-trusty/openstack/mitaka/holdback/${_param:apt_mk_version}
+              - ubuntu-trusty/openstack/mitaka/holdback/${_param:mcp_version}
 
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/openstack/newton.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/openstack/newton.yml
index 619fa3a..f4b7edb 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/openstack/newton.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/openstack/newton.yml
@@ -2,35 +2,35 @@
   _param:
 
     mirror_mirantis_openstack_newton_trusty_source: http://apt.mirantis.com/trusty/openstack/newton/
-    mirror_mirantis_openstack_newton_trusty_distribution: ${_param:apt_mk_version}
+    mirror_mirantis_openstack_newton_trusty_distribution: ${_param:mcp_version}
     mirror_mirantis_openstack_newton_trusty_components: main restricted
     mirror_mirantis_openstack_newton_trusty_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mirantis_openstack_newton_trusty_gpgkeys:
       - A76882D3
 
     mirror_mirantis_openstack_newton_hotfix_trusty_source: http://apt.mirantis.com/trusty/openstack/newton/hotfix/
-    mirror_mirantis_openstack_newton_hotfix_trusty_distribution: ${_param:apt_mk_version}
+    mirror_mirantis_openstack_newton_hotfix_trusty_distribution: ${_param:mcp_version}
     mirror_mirantis_openstack_newton_hotfix_trusty_components: main restricted
     mirror_mirantis_openstack_newton_hotfix_trusty_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mirantis_openstack_newton_hotfix_trusty_gpgkeys:
       - A76882D3
 
     mirror_mirantis_openstack_newton_security_trusty_source: http://apt.mirantis.com/trusty/openstack/newton/security/
-    mirror_mirantis_openstack_newton_security_trusty_distribution: ${_param:apt_mk_version}
+    mirror_mirantis_openstack_newton_security_trusty_distribution: ${_param:mcp_version}
     mirror_mirantis_openstack_newton_security_trusty_components: main restricted
     mirror_mirantis_openstack_newton_security_trusty_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mirantis_openstack_newton_security_trusty_gpgkeys:
       - A76882D3
 
     mirror_mirantis_openstack_newton_updates_trusty_source: http://apt.mirantis.com/trusty/openstack/newton/updates/
-    mirror_mirantis_openstack_newton_updates_trusty_distribution: ${_param:apt_mk_version}
+    mirror_mirantis_openstack_newton_updates_trusty_distribution: ${_param:mcp_version}
     mirror_mirantis_openstack_newton_updates_trusty_components: main restricted
     mirror_mirantis_openstack_newton_updates_trusty_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mirantis_openstack_newton_updates_trusty_gpgkeys:
       - A76882D3
 
     mirror_mirantis_openstack_newton_holdback_trusty_source: http://apt.mirantis.com/trusty/openstack/newton/holdback/
-    mirror_mirantis_openstack_newton_holdback_trusty_distribution: ${_param:apt_mk_version}
+    mirror_mirantis_openstack_newton_holdback_trusty_distribution: ${_param:mcp_version}
     mirror_mirantis_openstack_newton_holdback_trusty_components: main restricted
     mirror_mirantis_openstack_newton_holdback_trusty_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mirantis_openstack_newton_holdback_trusty_gpgkeys:
@@ -48,7 +48,7 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-trusty/openstack/newton/${_param:apt_mk_version}
+              - ubuntu-trusty/openstack/newton/${_param:mcp_version}
 
         mirantis_openstack_newton_hotfix_trusty:
           source: ${_param:mirror_mirantis_openstack_newton_hotfix_trusty_source}
@@ -60,7 +60,7 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-trusty/openstack/newton/hotfix/${_param:apt_mk_version}
+              - ubuntu-trusty/openstack/newton/hotfix/${_param:mcp_version}
 
         mirantis_openstack_newton_security_trusty:
           source: ${_param:mirror_mirantis_openstack_newton_security_trusty_source}
@@ -72,7 +72,7 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-trusty/openstack/newton/security/${_param:apt_mk_version}
+              - ubuntu-trusty/openstack/newton/security/${_param:mcp_version}
 
         # required for alternative horizon plugins/etc..
         mirantis_openstack_newton_updates_trusty:
@@ -85,7 +85,7 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-trusty/openstack/newton/updates/${_param:apt_mk_version}
+              - ubuntu-trusty/openstack/newton/updates/${_param:mcp_version}
 
         # required for salt formulas
         mirantis_openstack_newton_holdback_trusty:
@@ -98,5 +98,5 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-trusty/openstack/newton/holdback/${_param:apt_mk_version}
+              - ubuntu-trusty/openstack/newton/holdback/${_param:mcp_version}
 
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/openstack/ocata.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/openstack/ocata.yml
index 11c287f..c4a97dc 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/openstack/ocata.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/openstack/ocata.yml
@@ -2,35 +2,35 @@
   _param:
 
     mirror_mirantis_openstack_ocata_trusty_source: http://apt.mirantis.com/trusty/openstack/ocata/
-    mirror_mirantis_openstack_ocata_trusty_distribution: ${_param:apt_mk_version}
+    mirror_mirantis_openstack_ocata_trusty_distribution: ${_param:mcp_version}
     mirror_mirantis_openstack_ocata_trusty_components: main restricted
     mirror_mirantis_openstack_ocata_trusty_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mirantis_openstack_ocata_trusty_gpgkeys:
       - A76882D3
 
     mirror_mirantis_openstack_ocata_hotfix_trusty_source: http://apt.mirantis.com/trusty/openstack/ocata/hotfix/
-    mirror_mirantis_openstack_ocata_hotfix_trusty_distribution: ${_param:apt_mk_version}
+    mirror_mirantis_openstack_ocata_hotfix_trusty_distribution: ${_param:mcp_version}
     mirror_mirantis_openstack_ocata_hotfix_trusty_components: main restricted
     mirror_mirantis_openstack_ocata_hotfix_trusty_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mirantis_openstack_ocata_hotfix_trusty_gpgkeys:
       - A76882D3
 
     mirror_mirantis_openstack_ocata_security_trusty_source: http://apt.mirantis.com/trusty/openstack/ocata/security/
-    mirror_mirantis_openstack_ocata_security_trusty_distribution: ${_param:apt_mk_version}
+    mirror_mirantis_openstack_ocata_security_trusty_distribution: ${_param:mcp_version}
     mirror_mirantis_openstack_ocata_security_trusty_components: main restricted
     mirror_mirantis_openstack_ocata_security_trusty_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mirantis_openstack_ocata_security_trusty_gpgkeys:
       - A76882D3
 
     mirror_mirantis_openstack_ocata_updates_trusty_source: http://apt.mirantis.com/trusty/openstack/ocata/updates/
-    mirror_mirantis_openstack_ocata_updates_trusty_distribution: ${_param:apt_mk_version}
+    mirror_mirantis_openstack_ocata_updates_trusty_distribution: ${_param:mcp_version}
     mirror_mirantis_openstack_ocata_updates_trusty_components: main restricted
     mirror_mirantis_openstack_ocata_updates_trusty_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mirantis_openstack_ocata_updates_trusty_gpgkeys:
       - A76882D3
 
     mirror_mirantis_openstack_ocata_holdback_trusty_source: http://apt.mirantis.com/trusty/openstack/ocata/holdback/
-    mirror_mirantis_openstack_ocata_holdback_trusty_distribution: ${_param:apt_mk_version}
+    mirror_mirantis_openstack_ocata_holdback_trusty_distribution: ${_param:mcp_version}
     mirror_mirantis_openstack_ocata_holdback_trusty_components: main restricted
     mirror_mirantis_openstack_ocata_holdback_trusty_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mirantis_openstack_ocata_holdback_trusty_gpgkeys:
@@ -48,7 +48,7 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-trusty/openstack/ocata/${_param:apt_mk_version}
+              - ubuntu-trusty/openstack/ocata/${_param:mcp_version}
 
         mirantis_openstack_ocata_hotfix_trusty:
           source: ${_param:mirror_mirantis_openstack_ocata_hotfix_trusty_source}
@@ -60,7 +60,7 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-trusty/openstack/ocata/hotfix/${_param:apt_mk_version}
+              - ubuntu-trusty/openstack/ocata/hotfix/${_param:mcp_version}
 
         mirantis_openstack_ocata_security_trusty:
           source: ${_param:mirror_mirantis_openstack_ocata_security_trusty_source}
@@ -72,7 +72,7 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-trusty/openstack/ocata/security/${_param:apt_mk_version}
+              - ubuntu-trusty/openstack/ocata/security/${_param:mcp_version}
 
         # required for alternative horizon plugins/etc..
         mirantis_openstack_ocata_updates_trusty:
@@ -85,7 +85,7 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-trusty/openstack/ocata/updates/${_param:apt_mk_version}
+              - ubuntu-trusty/openstack/ocata/updates/${_param:mcp_version}
 
         # required for salt formulas
         mirantis_openstack_ocata_holdback_trusty:
@@ -98,5 +98,5 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-trusty/openstack/ocata/holdback/${_param:apt_mk_version}
+              - ubuntu-trusty/openstack/ocata/holdback/${_param:mcp_version}
 
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/salt.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/salt.yml
index 0a93978..9e66619 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/salt.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/salt.yml
@@ -1,7 +1,7 @@
 parameters:
   _param:
     mirror_mirantis_openstack_trusty_salt_source: http://apt.mirantis.com/trusty/
-    mirror_mirantis_openstack_trusty_salt_distribution: ${_param:apt_mk_version}
+    mirror_mirantis_openstack_trusty_salt_distribution: ${_param:mcp_version}
     mirror_mirantis_openstack_trusty_salt_components: salt
     mirror_mirantis_openstack_trusty_salt_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mirantis_openstack_trusty_salt_gpgkeys:
@@ -19,4 +19,4 @@
           publisher:
             component: salt
             distributions:
-              - ubuntu-trusty/${_param:apt_mk_version}
\ No newline at end of file
+              - ubuntu-trusty/${_param:mcp_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/salt-2016-3.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/salt-2016-3.yml
index 2506306..b01df60 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/salt-2016-3.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/salt-2016-3.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    mirror_mirantis_openstack_trusty_saltstack_2016_3_source: http://mirror.mirantis.com/${_param:apt_mk_version}/saltstack-2016.3/trusty/
+    mirror_mirantis_openstack_trusty_saltstack_2016_3_source: http://mirror.mirantis.com/${_param:mcp_version}/saltstack-2016.3/trusty/
     mirror_mirantis_openstack_trusty_saltstack_2016_3_distribution: trusty
     mirror_mirantis_openstack_trusty_saltstack_2016_3_components: main
     mirror_mirantis_openstack_trusty_saltstack_2016_3_gpgkeys:
@@ -17,4 +17,4 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-trusty/salt/2016.3/${_param:apt_mk_version}
\ No newline at end of file
+              - ubuntu-trusty/salt/2016.3/${_param:mcp_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/salt-2017-7.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/salt-2017-7.yml
index bcea186..6234182 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/salt-2017-7.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/salt-2017-7.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    mirror_mirantis_openstack_trusty_saltstack_2017_7_source: http://mirror.mirantis.com/${_param:apt_mk_version}/saltstack-2017.7/trusty/
+    mirror_mirantis_openstack_trusty_saltstack_2017_7_source: http://mirror.mirantis.com/${_param:mcp_version}/saltstack-2017.7/trusty/
     mirror_mirantis_openstack_trusty_saltstack_2017_7_distribution: trusty
     mirror_mirantis_openstack_trusty_saltstack_2017_7_components: main
     mirror_mirantis_openstack_trusty_saltstack_2017_7_gpgkeys:
@@ -17,4 +17,4 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-trusty/salt/2017.7/${_param:apt_mk_version}
+              - ubuntu-trusty/salt/2017.7/${_param:mcp_version}
diff --git a/aptly/server/mirror/ubuntu/trusty/salt.yml b/aptly/server/mirror/ubuntu/trusty/salt.yml
index 6f88820..9adb3ae 100644
--- a/aptly/server/mirror/ubuntu/trusty/salt.yml
+++ b/aptly/server/mirror/ubuntu/trusty/salt.yml
@@ -17,5 +17,5 @@
           publisher:
             component: salt
             distributions:
-              - ubuntu-trusty/${_param:apt_mk_version}
+              - ubuntu-trusty/${_param:mcp_version}
 
diff --git a/aptly/server/mirror/ubuntu/xenial/ceph.yml b/aptly/server/mirror/ubuntu/xenial/ceph.yml
index 1991c13..d534332 100644
--- a/aptly/server/mirror/ubuntu/xenial/ceph.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ceph.yml
@@ -18,4 +18,4 @@
           publisher:
             component: ceph
             distributions:
-              - ubuntu-xenial/${_param:apt_mk_version}
+              - ubuntu-xenial/${_param:mcp_version}
diff --git a/aptly/server/mirror/ubuntu/xenial/ceph_mirantis.yml b/aptly/server/mirror/ubuntu/xenial/ceph_mirantis.yml
index cec365b..2045171 100644
--- a/aptly/server/mirror/ubuntu/xenial/ceph_mirantis.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ceph_mirantis.yml
@@ -17,4 +17,4 @@
           publisher:
             component: ceph-mirantis
             distributions:
-              - ubuntu-xenial/${_param:apt_mk_version}
+              - ubuntu-xenial/${_param:mcp_version}
diff --git a/aptly/server/mirror/ubuntu/xenial/docker.yml b/aptly/server/mirror/ubuntu/xenial/docker.yml
index 5c1f719..203eab4 100644
--- a/aptly/server/mirror/ubuntu/xenial/docker.yml
+++ b/aptly/server/mirror/ubuntu/xenial/docker.yml
@@ -17,4 +17,4 @@
           publisher:
             component: docker
             distributions:
-              - ubuntu-xenial/${_param:apt_mk_version}
+              - ubuntu-xenial/${_param:mcp_version}
diff --git a/aptly/server/mirror/ubuntu/xenial/docker_legacy.yml b/aptly/server/mirror/ubuntu/xenial/docker_legacy.yml
index f58a974..4803056 100644
--- a/aptly/server/mirror/ubuntu/xenial/docker_legacy.yml
+++ b/aptly/server/mirror/ubuntu/xenial/docker_legacy.yml
@@ -17,4 +17,4 @@
           publisher:
             component: docker-legacy
             distributions:
-              - ubuntu-xenial/${_param:apt_mk_version}
\ No newline at end of file
+              - ubuntu-xenial/${_param:mcp_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/glusterfs.yml b/aptly/server/mirror/ubuntu/xenial/glusterfs.yml
index 0ae7a47..b48a7ed 100644
--- a/aptly/server/mirror/ubuntu/xenial/glusterfs.yml
+++ b/aptly/server/mirror/ubuntu/xenial/glusterfs.yml
@@ -18,4 +18,4 @@
           publisher:
             component: glusterfs
             distributions:
-              - ubuntu-xenial/${_param:apt_mk_version}
+              - ubuntu-xenial/${_param:mcp_version}
diff --git a/aptly/server/mirror/ubuntu/xenial/grafana.yml b/aptly/server/mirror/ubuntu/xenial/grafana.yml
index 4b9426d..e28b970 100644
--- a/aptly/server/mirror/ubuntu/xenial/grafana.yml
+++ b/aptly/server/mirror/ubuntu/xenial/grafana.yml
@@ -17,4 +17,4 @@
           publisher:
             component: grafana
             distributions:
-              - ubuntu-xenial/${_param:apt_mk_version}
+              - ubuntu-xenial/${_param:mcp_version}
diff --git a/aptly/server/mirror/ubuntu/xenial/influxdb.yml b/aptly/server/mirror/ubuntu/xenial/influxdb.yml
index deea749..9877a51 100644
--- a/aptly/server/mirror/ubuntu/xenial/influxdb.yml
+++ b/aptly/server/mirror/ubuntu/xenial/influxdb.yml
@@ -17,4 +17,4 @@
           publisher:
             component: influxdb
             distributions:
-              - ubuntu-xenial/${_param:apt_mk_version}
+              - ubuntu-xenial/${_param:mcp_version}
diff --git a/aptly/server/mirror/ubuntu/xenial/maas.yml b/aptly/server/mirror/ubuntu/xenial/maas.yml
index d8cf3ad..b188710 100644
--- a/aptly/server/mirror/ubuntu/xenial/maas.yml
+++ b/aptly/server/mirror/ubuntu/xenial/maas.yml
@@ -17,4 +17,4 @@
           publisher:
             component: maas
             distributions:
-              - xenial/${_param:apt_mk_version}
+              - xenial/${_param:mcp_version}
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/aptly.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/aptly.yml
index 682ceaa..364920e 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/aptly.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/aptly.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    mirror_mirantis_openstack_xenial_aptly_source: http://mirror.mirantis.com/${_param:apt_mk_version}/aptly/xenial/
+    mirror_mirantis_openstack_xenial_aptly_source: http://mirror.mirantis.com/${_param:mcp_version}/aptly/xenial/
     mirror_mirantis_openstack_xenial_aptly_distribution: squeeze
     mirror_mirantis_openstack_xenial_aptly_components: main
     mirror_mirantis_openstack_xenial_aptly_gpgkeys:
@@ -18,4 +18,4 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-xenial/aptly/${_param:apt_mk_version}
\ No newline at end of file
+              - ubuntu-xenial/aptly/${_param:mcp_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/cassandra.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/cassandra.yml
index 0905c8b..7492000 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/cassandra.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/cassandra.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    mirror_mirantis_openstack_xenial_cassandra_source: http://mirror.mirantis.com/${_param:apt_mk_version}/cassandra/xenial/
+    mirror_mirantis_openstack_xenial_cassandra_source: http://mirror.mirantis.com/${_param:mcp_version}/cassandra/xenial/
     mirror_mirantis_openstack_xenial_cassandra_distribution: 21x
     mirror_mirantis_openstack_xenial_cassandra_components: main
     mirror_mirantis_openstack_xenial_cassandra_gpgkeys:
@@ -20,4 +20,4 @@
           publisher:
             component: 21x
             distributions:
-              - ubuntu-xenial/cassandra/${_param:apt_mk_version}
\ No newline at end of file
+              - ubuntu-xenial/cassandra/${_param:mcp_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/ceph.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/ceph.yml
index 5672389..8af4bd0 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/ceph.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/ceph.yml
@@ -1,7 +1,7 @@
 parameters:
   _param:
     mirror_mirantis_openstack_xenial_ceph_source: http://apt.mirantis.com/xenial/
-    mirror_mirantis_openstack_xenial_ceph_distribution: ${_param:apt_mk_version}
+    mirror_mirantis_openstack_xenial_ceph_distribution: ${_param:mcp_version}
     mirror_mirantis_openstack_xenial_ceph_components: ceph-luminous
     mirror_mirantis_openstack_xenial_ceph_gpgkeys:
       - A76882D3
@@ -17,4 +17,4 @@
           publisher:
             component: luminous
             distributions:
-              - ubuntu-xenial/ceph/${_param:apt_mk_version}
\ No newline at end of file
+              - ubuntu-xenial/ceph/${_param:mcp_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/docker-legacy.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/docker-legacy.yml
index 46e38ff..2e7f7e4 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/docker-legacy.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/docker-legacy.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    mirror_mirantis_openstack_xenial_docker_legacy_source: http://mirror.mirantis.com/${_param:apt_mk_version}/docker-1.x/xenial/
+    mirror_mirantis_openstack_xenial_docker_legacy_source: http://mirror.mirantis.com/${_param:mcp_version}/docker-1.x/xenial/
     mirror_mirantis_openstack_xenial_docker_legacy_distribution: ubuntu-xenial
     mirror_mirantis_openstack_xenial_docker_legacy_components: main
     mirror_mirantis_openstack_xenial_docker_legacy_gpgkeys:
@@ -17,4 +17,4 @@
           publisher:
             component: legacy
             distributions:
-              - ubuntu-xenial/docker/${_param:apt_mk_version}
\ No newline at end of file
+              - ubuntu-xenial/docker/${_param:mcp_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/docker.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/docker.yml
index f9ec50f..0207d90 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/docker.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/docker.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    mirror_mirantis_openstack_xenial_docker_source: http://mirror.mirantis.com/${_param:apt_mk_version}/docker/xenial/
+    mirror_mirantis_openstack_xenial_docker_source: http://mirror.mirantis.com/${_param:mcp_version}/docker/xenial/
     mirror_mirantis_openstack_xenial_docker_distribution: xenial
     mirror_mirantis_openstack_xenial_docker_components: stable
     mirror_mirantis_openstack_xenial_docker_gpgkeys:
@@ -17,4 +17,4 @@
           publisher:
             component: stable
             distributions:
-              - ubuntu-xenial/docker/${_param:apt_mk_version}
\ No newline at end of file
+              - ubuntu-xenial/docker/${_param:mcp_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/2x.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/2x.yml
index bcfc3d2..013c312 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/2x.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/2x.yml
@@ -1,7 +1,7 @@
 parameters:
   _param:
-    mirror_mirantis_openstack_xenial_elastic_2x_source: http://mirror.mirantis.com/${_param:apt_mk_version}/elasticsearch-2.x/xenial/
-    mirror_mirantis_openstack_xenial_elastic_curator_2x_source: http://mirror.mirantis.com/${_param:apt_mk_version}/elasticsearch-curator/xenial/
+    mirror_mirantis_openstack_xenial_elastic_2x_source: http://mirror.mirantis.com/${_param:mcp_version}/elasticsearch-2.x/xenial/
+    mirror_mirantis_openstack_xenial_elastic_curator_2x_source: http://mirror.mirantis.com/${_param:mcp_version}/elasticsearch-curator/xenial/
     mirror_mirantis_openstack_xenial_elastic_2x_distribution: stable
     mirror_mirantis_openstack_xenial_elastic_2x_components: main
     mirror_mirantis_openstack_xenial_elastic_2x_gpgkeys:
@@ -18,7 +18,7 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-xenial/elastic/2.x/${_param:apt_mk_version}
+              - ubuntu-xenial/elastic/2.x/${_param:mcp_version}
         mirantis_openstack_xenial_elastic_curator_2x:
           source: ${_param:mirror_mirantis_openstack_xenial_elastic_curator_2x_source}
           distribution: ${_param:mirror_mirantis_openstack_xenial_elastic_2x_distribution}
@@ -28,4 +28,4 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-xenial/elastic/2.x/${_param:apt_mk_version}
+              - ubuntu-xenial/elastic/2.x/${_param:mcp_version}
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/5x.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/5x.yml
index 6431a78..f38cab8 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/5x.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/5x.yml
@@ -1,7 +1,7 @@
 parameters:
   _param:
-    mirror_mirantis_openstack_xenial_elastic_5x_source: http://mirror.mirantis.com/${_param:apt_mk_version}/elasticsearch-5.x/xenial/
-    mirror_mirantis_openstack_xenial_elastic_curator_5x_source: http://mirror.mirantis.com/${_param:apt_mk_version}/elasticsearch-curator-5/xenial/
+    mirror_mirantis_openstack_xenial_elastic_5x_source: http://mirror.mirantis.com/${_param:mcp_version}/elasticsearch-5.x/xenial/
+    mirror_mirantis_openstack_xenial_elastic_curator_5x_source: http://mirror.mirantis.com/${_param:mcp_version}/elasticsearch-curator-5/xenial/
     mirror_mirantis_openstack_xenial_elastic_5x_distribution: stable
     mirror_mirantis_openstack_xenial_elastic_5x_components: main
     mirror_mirantis_openstack_xenial_elastic_5x_gpgkeys:
@@ -18,7 +18,7 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-xenial/elastic/5.x/${_param:apt_mk_version}
+              - ubuntu-xenial/elastic/5.x/${_param:mcp_version}
         mirantis_openstack_xenial_elastic_curator_5x:
           source: ${_param:mirror_mirantis_openstack_xenial_elastic_curator_5x_source}
           distribution: ${_param:mirror_mirantis_openstack_xenial_elastic_5x_distribution}
@@ -28,4 +28,4 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-xenial/elastic/5.x/${_param:apt_mk_version}
+              - ubuntu-xenial/elastic/5.x/${_param:mcp_version}
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/extra.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/extra.yml
index b9912dc..eb1e068 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/extra.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/extra.yml
@@ -1,7 +1,7 @@
 parameters:
   _param:
     mirror_mirantis_openstack_xenial_extra_source: http://apt.mirantis.com/xenial/
-    mirror_mirantis_openstack_xenial_extra_distribution: ${_param:apt_mk_version}
+    mirror_mirantis_openstack_xenial_extra_distribution: ${_param:mcp_version}
     mirror_mirantis_openstack_xenial_extra_components: extra
     mirror_mirantis_openstack_xenial_extra_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mirantis_openstack_xenial_extra_gpgkeys:
@@ -19,4 +19,4 @@
           publisher:
             component: extra
             distributions:
-              - ubuntu-xenial/${_param:apt_mk_version}
\ No newline at end of file
+              - ubuntu-xenial/${_param:mcp_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/fluentd.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/fluentd.yml
index 4d2f7ed..5535d53 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/fluentd.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/fluentd.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    mirror_mirantis_openstack_xenial_fluentd_source: http://mirror.mirantis.com/${_param:apt_mk_version}/td-agent/xenial
+    mirror_mirantis_openstack_xenial_fluentd_source: http://mirror.mirantis.com/${_param:mcp_version}/td-agent/xenial
     mirror_mirantis_openstack_xenial_fluentd_distribution: xenial
     mirror_mirantis_openstack_xenial_fluentd_components: contrib
     mirror_mirantis_openstack_xenial_fluentd_gpgkeys:
@@ -17,4 +17,4 @@
           publisher:
             component: contrib
             distributions:
-              - ubuntu-xenial/fluentd/${_param:apt_mk_version}
+              - ubuntu-xenial/fluentd/${_param:mcp_version}
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/glusterfs.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/glusterfs.yml
index b6d57ba..1cb01d1 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/glusterfs.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/glusterfs.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    mirror_mirantis_openstack_xenial_glusterfs_source: http://mirror.mirantis.com/${_param:apt_mk_version}/glusterfs-3.8/xenial/
+    mirror_mirantis_openstack_xenial_glusterfs_source: http://mirror.mirantis.com/${_param:mcp_version}/glusterfs-3.8/xenial/
     mirror_mirantis_openstack_xenial_glusterfs_distribution: xenial
     mirror_mirantis_openstack_xenial_glusterfs_components: main
     mirror_mirantis_openstack_xenial_glusterfs_gpgkeys:
@@ -17,4 +17,4 @@
           publisher:
             component: '"3.8"'
             distributions:
-              - ubuntu-xenial/glusterfs/${_param:apt_mk_version}
\ No newline at end of file
+              - ubuntu-xenial/glusterfs/${_param:mcp_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/grafana.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/grafana.yml
index 1f6ac72..6be1e79 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/grafana.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/grafana.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    mirror_mirantis_openstack_xenial_grafana_source: http://mirror.mirantis.com/${_param:apt_mk_version}/grafana/xenial/
+    mirror_mirantis_openstack_xenial_grafana_source: http://mirror.mirantis.com/${_param:mcp_version}/grafana/xenial/
     mirror_mirantis_openstack_xenial_grafana_distribution: jessie
     mirror_mirantis_openstack_xenial_grafana_components: main
     mirror_mirantis_openstack_xenial_grafana_gpgkeys:
@@ -17,4 +17,4 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-xenial/grafana/${_param:apt_mk_version}
\ No newline at end of file
+              - ubuntu-xenial/grafana/${_param:mcp_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/influxdb.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/influxdb.yml
index fa7b724..abf278f 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/influxdb.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/influxdb.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    mirror_mirantis_openstack_xenial_influxdb_source: http://mirror.mirantis.com/${_param:apt_mk_version}/influxdb/xenial/
+    mirror_mirantis_openstack_xenial_influxdb_source: http://mirror.mirantis.com/${_param:mcp_version}/influxdb/xenial/
     mirror_mirantis_openstack_xenial_influxdb_distribution: xenial
     mirror_mirantis_openstack_xenial_influxdb_components: stable
     mirror_mirantis_openstack_xenial_influxdb_gpgkeys:
@@ -17,4 +17,4 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-xenial/influxdb/${_param:apt_mk_version}
\ No newline at end of file
+              - ubuntu-xenial/influxdb/${_param:mcp_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/kibana/46.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/kibana/46.yml
index 786c94b..dd7a1ba 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/kibana/46.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/kibana/46.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    mirror_mirantis_openstack_xenial_kibana_46_source: http://mirror.mirantis.com/${_param:apt_mk_version}/kibana-4.6/xenial/
+    mirror_mirantis_openstack_xenial_kibana_46_source: http://mirror.mirantis.com/${_param:mcp_version}/kibana-4.6/xenial/
     mirror_mirantis_openstack_xenial_kibana_46_distribution: stable
     mirror_mirantis_openstack_xenial_kibana_46_components: main
     mirror_mirantis_openstack_xenial_kibana_46_gpgkeys:
@@ -17,4 +17,4 @@
           publisher:
             component: kibana-46
             distributions:
-              - ubuntu-xenial/kibana/4.6/${_param:apt_mk_version}
\ No newline at end of file
+              - ubuntu-xenial/kibana/4.6/${_param:mcp_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/kibana/5x.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/kibana/5x.yml
index 194f051..aacde58 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/kibana/5x.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/kibana/5x.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    mirror_mirantis_openstack_xenial_kibana_5x_source: http://mirror.mirantis.com/${_param:apt_mk_version}/elasticsearch-5.x/xenial/
+    mirror_mirantis_openstack_xenial_kibana_5x_source: http://mirror.mirantis.com/${_param:mcp_version}/elasticsearch-5.x/xenial/
     mirror_mirantis_openstack_xenial_kibana_5x_distribution: stable
     mirror_mirantis_openstack_xenial_kibana_5x_components: main
     mirror_mirantis_openstack_xenial_kibana_5x_gpgkeys:
@@ -17,4 +17,4 @@
           publisher:
             component: kibana-5x
             distributions:
-              - ubuntu-xenial/kibana/5.x/${_param:apt_mk_version}
\ No newline at end of file
+              - ubuntu-xenial/kibana/5.x/${_param:mcp_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/maas.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/maas.yml
index b3f542b..a1cebb5 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/maas.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/maas.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    mirror_mirantis_openstack_xenial_maas_source: http://mirror.mirantis.com/${_param:apt_mk_version}/maas/xenial/
+    mirror_mirantis_openstack_xenial_maas_source: http://mirror.mirantis.com/${_param:mcp_version}/maas/xenial/
     mirror_mirantis_openstack_xenial_maas_distribution: xenial
     mirror_mirantis_openstack_xenial_maas_components: main
     mirror_mirantis_openstack_xenial_maas_gpgkeys:
@@ -17,4 +17,4 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-xenial/maas/${_param:apt_mk_version}
\ No newline at end of file
+              - ubuntu-xenial/maas/${_param:mcp_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc31.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc31.yml
index 8d4dfb2..2b2c092 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc31.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc31.yml
@@ -1,7 +1,7 @@
 parameters:
   _param:
     mirror_mcp_opencontrail_xenial_oc31_source: http://apt.mirantis.com/xenial/
-    mirror_mcp_opencontrail_xenial_oc31_distribution: ${_param:apt_mk_version}
+    mirror_mcp_opencontrail_xenial_oc31_distribution: ${_param:mcp_version}
     mirror_mcp_opencontrail_xenial_oc31_components: oc31
     mirror_mcp_opencontrail_xenial_oc31_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mcp_opencontrail_xenial_oc31_gpgkeys:
@@ -19,4 +19,4 @@
           publisher:
             component: oc31
             distributions:
-              - ubuntu-xenial/${_param:apt_mk_version}
\ No newline at end of file
+              - ubuntu-xenial/${_param:mcp_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc311.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc311.yml
index a5f3531..c1c9d6f 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc311.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc311.yml
@@ -1,7 +1,7 @@
 parameters:
   _param:
     mirror_mcp_opencontrail_xenial_oc311_source: http://apt.mirantis.com/xenial/
-    mirror_mcp_opencontrail_xenial_oc311_distribution: ${_param:apt_mk_version}
+    mirror_mcp_opencontrail_xenial_oc311_distribution: ${_param:mcp_version}
     mirror_mcp_opencontrail_xenial_oc311_components: oc311
     mirror_mcp_opencontrail_xenial_oc311_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mcp_opencontrail_xenial_oc311_gpgkeys:
@@ -19,4 +19,4 @@
           publisher:
             component: oc311
             distributions:
-              - ubuntu-xenial/${_param:apt_mk_version}
\ No newline at end of file
+              - ubuntu-xenial/${_param:mcp_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc32.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc32.yml
index c5c482b..82f4634 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc32.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc32.yml
@@ -1,7 +1,7 @@
 parameters:
   _param:
     mirror_mcp_opencontrail_xenial_oc32_source: http://apt.mirantis.com/xenial/
-    mirror_mcp_opencontrail_xenial_oc32_distribution: ${_param:apt_mk_version}
+    mirror_mcp_opencontrail_xenial_oc32_distribution: ${_param:mcp_version}
     mirror_mcp_opencontrail_xenial_oc32_components: oc32
     mirror_mcp_opencontrail_xenial_oc32_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mcp_opencontrail_xenial_oc32_gpgkeys:
@@ -19,4 +19,4 @@
           publisher:
             component: oc32
             distributions:
-              - ubuntu-xenial/${_param:apt_mk_version}
\ No newline at end of file
+              - ubuntu-xenial/${_param:mcp_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc323.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc323.yml
index 82e8375..03cedc7 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc323.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc323.yml
@@ -1,7 +1,7 @@
 parameters:
   _param:
     mirror_mcp_opencontrail_xenial_oc323_source: http://apt.mirantis.com/xenial/
-    mirror_mcp_opencontrail_xenial_oc323_distribution: ${_param:apt_mk_version}
+    mirror_mcp_opencontrail_xenial_oc323_distribution: ${_param:mcp_version}
     mirror_mcp_opencontrail_xenial_oc323_components: oc323
     mirror_mcp_opencontrail_xenial_oc323_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mcp_opencontrail_xenial_oc323_gpgkeys:
@@ -19,4 +19,4 @@
           publisher:
             component: oc323
             distributions:
-              - ubuntu-xenial/${_param:apt_mk_version}
\ No newline at end of file
+              - ubuntu-xenial/${_param:mcp_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/ocata.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/ocata.yml
index 2475e42..5b20c6b 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/ocata.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/ocata.yml
@@ -1,7 +1,7 @@
 parameters:
   _param:
     mirror_mk_openstack_xenial_ocata_source: http://apt.mirantis.com/xenial/
-    mirror_mk_openstack_xenial_ocata_distribution: ${_param:apt_mk_version}
+    mirror_mk_openstack_xenial_ocata_distribution: ${_param:mcp_version}
     mirror_mk_openstack_xenial_ocata_components: ocata
     mirror_mk_openstack_xenial_ocata_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mk_openstack_xenial_ocata_gpgkeys:
@@ -19,4 +19,4 @@
           publisher:
             component: ocata
             distributions:
-              - ubuntu-xenial/${_param:apt_mk_version}
\ No newline at end of file
+              - ubuntu-xenial/${_param:mcp_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/openstack/mitaka.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/openstack/mitaka.yml
index 607384e..3b01f33 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/openstack/mitaka.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/openstack/mitaka.yml
@@ -2,35 +2,35 @@
   _param:
 
     mirror_mirantis_openstack_mitaka_xenial_source: http://apt.mirantis.com/xenial/openstack/mitaka/
-    mirror_mirantis_openstack_mitaka_xenial_distribution: ${_param:apt_mk_version}
+    mirror_mirantis_openstack_mitaka_xenial_distribution: ${_param:mcp_version}
     mirror_mirantis_openstack_mitaka_xenial_components: main restricted
     mirror_mirantis_openstack_mitaka_xenial_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mirantis_openstack_mitaka_xenial_gpgkeys:
       - A76882D3
 
     mirror_mirantis_openstack_mitaka_hotfix_xenial_source: http://apt.mirantis.com/xenial/openstack/mitaka/hotfix/
-    mirror_mirantis_openstack_mitaka_hotfix_xenial_distribution: ${_param:apt_mk_version}
+    mirror_mirantis_openstack_mitaka_hotfix_xenial_distribution: ${_param:mcp_version}
     mirror_mirantis_openstack_mitaka_hotfix_xenial_components: main restricted
     mirror_mirantis_openstack_mitaka_hotfix_xenial_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mirantis_openstack_mitaka_hotfix_xenial_gpgkeys:
       - A76882D3
 
     mirror_mirantis_openstack_mitaka_security_xenial_source: http://apt.mirantis.com/xenial/openstack/mitaka/security/
-    mirror_mirantis_openstack_mitaka_security_xenial_distribution: ${_param:apt_mk_version}
+    mirror_mirantis_openstack_mitaka_security_xenial_distribution: ${_param:mcp_version}
     mirror_mirantis_openstack_mitaka_security_xenial_components: main restricted
     mirror_mirantis_openstack_mitaka_security_xenial_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mirantis_openstack_mitaka_security_xenial_gpgkeys:
       - A76882D3
 
     mirror_mirantis_openstack_mitaka_updates_xenial_source: http://apt.mirantis.com/xenial/openstack/mitaka/updates/
-    mirror_mirantis_openstack_mitaka_updates_xenial_distribution: ${_param:apt_mk_version}
+    mirror_mirantis_openstack_mitaka_updates_xenial_distribution: ${_param:mcp_version}
     mirror_mirantis_openstack_mitaka_updates_xenial_components: main restricted
     mirror_mirantis_openstack_mitaka_updates_xenial_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mirantis_openstack_mitaka_updates_xenial_gpgkeys:
       - A76882D3
 
     mirror_mirantis_openstack_mitaka_holdback_xenial_source: http://apt.mirantis.com/xenial/openstack/mitaka/holdback/
-    mirror_mirantis_openstack_mitaka_holdback_xenial_distribution: ${_param:apt_mk_version}
+    mirror_mirantis_openstack_mitaka_holdback_xenial_distribution: ${_param:mcp_version}
     mirror_mirantis_openstack_mitaka_holdback_xenial_components: main restricted
     mirror_mirantis_openstack_mitaka_holdback_xenial_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mirantis_openstack_mitaka_holdback_xenial_gpgkeys:
@@ -48,7 +48,7 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-xenial/openstack/mitaka/${_param:apt_mk_version}
+              - ubuntu-xenial/openstack/mitaka/${_param:mcp_version}
 
         mirantis_openstack_mitaka_hotfix_xenial:
           source: ${_param:mirror_mirantis_openstack_mitaka_hotfix_xenial_source}
@@ -60,7 +60,7 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-xenial/openstack/mitaka/hotfix/${_param:apt_mk_version}
+              - ubuntu-xenial/openstack/mitaka/hotfix/${_param:mcp_version}
 
         mirantis_openstack_mitaka_security_xenial:
           source: ${_param:mirror_mirantis_openstack_mitaka_security_xenial_source}
@@ -72,7 +72,7 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-xenial/openstack/mitaka/security/${_param:apt_mk_version}
+              - ubuntu-xenial/openstack/mitaka/security/${_param:mcp_version}
 
         # required for alternative horizon plugins/etc..
         mirantis_openstack_mitaka_updates_xenial:
@@ -85,7 +85,7 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-xenial/openstack/mitaka/updates/${_param:apt_mk_version}
+              - ubuntu-xenial/openstack/mitaka/updates/${_param:mcp_version}
 
         # required for salt formulas
         mirantis_openstack_mitaka_holdback_xenial:
@@ -98,5 +98,5 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-xenial/openstack/mitaka/holdback/${_param:apt_mk_version}
+              - ubuntu-xenial/openstack/mitaka/holdback/${_param:mcp_version}
 
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/openstack/newton.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/openstack/newton.yml
index ae5885b..a4f830a 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/openstack/newton.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/openstack/newton.yml
@@ -2,35 +2,35 @@
   _param:
 
     mirror_mirantis_openstack_newton_xenial_source: http://apt.mirantis.com/xenial/openstack/newton/
-    mirror_mirantis_openstack_newton_xenial_distribution: ${_param:apt_mk_version}
+    mirror_mirantis_openstack_newton_xenial_distribution: ${_param:mcp_version}
     mirror_mirantis_openstack_newton_xenial_components: main restricted
     mirror_mirantis_openstack_newton_xenial_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mirantis_openstack_newton_xenial_gpgkeys:
       - A76882D3
 
     mirror_mirantis_openstack_newton_hotfix_xenial_source: http://apt.mirantis.com/xenial/openstack/newton/hotfix/
-    mirror_mirantis_openstack_newton_hotfix_xenial_distribution: ${_param:apt_mk_version}
+    mirror_mirantis_openstack_newton_hotfix_xenial_distribution: ${_param:mcp_version}
     mirror_mirantis_openstack_newton_hotfix_xenial_components: main restricted
     mirror_mirantis_openstack_newton_hotfix_xenial_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mirantis_openstack_newton_hotfix_xenial_gpgkeys:
       - A76882D3
 
     mirror_mirantis_openstack_newton_security_xenial_source: http://apt.mirantis.com/xenial/openstack/newton/security/
-    mirror_mirantis_openstack_newton_security_xenial_distribution: ${_param:apt_mk_version}
+    mirror_mirantis_openstack_newton_security_xenial_distribution: ${_param:mcp_version}
     mirror_mirantis_openstack_newton_security_xenial_components: main restricted
     mirror_mirantis_openstack_newton_security_xenial_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mirantis_openstack_newton_security_xenial_gpgkeys:
       - A76882D3
 
     mirror_mirantis_openstack_newton_updates_xenial_source: http://apt.mirantis.com/xenial/openstack/newton/updates/
-    mirror_mirantis_openstack_newton_updates_xenial_distribution: ${_param:apt_mk_version}
+    mirror_mirantis_openstack_newton_updates_xenial_distribution: ${_param:mcp_version}
     mirror_mirantis_openstack_newton_updates_xenial_components: main restricted
     mirror_mirantis_openstack_newton_updates_xenial_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mirantis_openstack_newton_updates_xenial_gpgkeys:
       - A76882D3
 
     mirror_mirantis_openstack_newton_holdback_xenial_source: http://apt.mirantis.com/xenial/openstack/newton/holdback/
-    mirror_mirantis_openstack_newton_holdback_xenial_distribution: ${_param:apt_mk_version}
+    mirror_mirantis_openstack_newton_holdback_xenial_distribution: ${_param:mcp_version}
     mirror_mirantis_openstack_newton_holdback_xenial_components: main restricted
     mirror_mirantis_openstack_newton_holdback_xenial_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mirantis_openstack_newton_holdback_xenial_gpgkeys:
@@ -48,7 +48,7 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-xenial/openstack/newton/${_param:apt_mk_version}
+              - ubuntu-xenial/openstack/newton/${_param:mcp_version}
 
         mirantis_openstack_newton_hotfix_xenial:
           source: ${_param:mirror_mirantis_openstack_newton_hotfix_xenial_source}
@@ -60,7 +60,7 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-xenial/openstack/newton/hotfix/${_param:apt_mk_version}
+              - ubuntu-xenial/openstack/newton/hotfix/${_param:mcp_version}
 
         mirantis_openstack_newton_security_xenial:
           source: ${_param:mirror_mirantis_openstack_newton_security_xenial_source}
@@ -72,7 +72,7 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-xenial/openstack/newton/security/${_param:apt_mk_version}
+              - ubuntu-xenial/openstack/newton/security/${_param:mcp_version}
 
         # required for alternative horizon plugins/etc..
         mirantis_openstack_newton_updates_xenial:
@@ -85,7 +85,7 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-xenial/openstack/newton/updates/${_param:apt_mk_version}
+              - ubuntu-xenial/openstack/newton/updates/${_param:mcp_version}
 
         # required for salt formulas
         mirantis_openstack_newton_holdback_xenial:
@@ -98,5 +98,5 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-xenial/openstack/newton/holdback/${_param:apt_mk_version}
+              - ubuntu-xenial/openstack/newton/holdback/${_param:mcp_version}
 
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/openstack/ocata.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/openstack/ocata.yml
index 95a7f73..2091e5c 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/openstack/ocata.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/openstack/ocata.yml
@@ -2,35 +2,35 @@
   _param:
 
     mirror_mirantis_openstack_ocata_xenial_source: http://apt.mirantis.com/xenial/openstack/ocata/
-    mirror_mirantis_openstack_ocata_xenial_distribution: ${_param:apt_mk_version}
+    mirror_mirantis_openstack_ocata_xenial_distribution: ${_param:mcp_version}
     mirror_mirantis_openstack_ocata_xenial_components: main restricted
     mirror_mirantis_openstack_ocata_xenial_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mirantis_openstack_ocata_xenial_gpgkeys:
       - A76882D3
 
     mirror_mirantis_openstack_ocata_hotfix_xenial_source: http://apt.mirantis.com/xenial/openstack/ocata/hotfix/
-    mirror_mirantis_openstack_ocata_hotfix_xenial_distribution: ${_param:apt_mk_version}
+    mirror_mirantis_openstack_ocata_hotfix_xenial_distribution: ${_param:mcp_version}
     mirror_mirantis_openstack_ocata_hotfix_xenial_components: main restricted
     mirror_mirantis_openstack_ocata_hotfix_xenial_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mirantis_openstack_ocata_hotfix_xenial_gpgkeys:
       - A76882D3
 
     mirror_mirantis_openstack_ocata_security_xenial_source: http://apt.mirantis.com/xenial/openstack/ocata/security/
-    mirror_mirantis_openstack_ocata_security_xenial_distribution: ${_param:apt_mk_version}
+    mirror_mirantis_openstack_ocata_security_xenial_distribution: ${_param:mcp_version}
     mirror_mirantis_openstack_ocata_security_xenial_components: main restricted
     mirror_mirantis_openstack_ocata_security_xenial_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mirantis_openstack_ocata_security_xenial_gpgkeys:
       - A76882D3
 
     mirror_mirantis_openstack_ocata_updates_xenial_source: http://apt.mirantis.com/xenial/openstack/ocata/updates/
-    mirror_mirantis_openstack_ocata_updates_xenial_distribution: ${_param:apt_mk_version}
+    mirror_mirantis_openstack_ocata_updates_xenial_distribution: ${_param:mcp_version}
     mirror_mirantis_openstack_ocata_updates_xenial_components: main restricted
     mirror_mirantis_openstack_ocata_updates_xenial_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mirantis_openstack_ocata_updates_xenial_gpgkeys:
       - A76882D3
 
     mirror_mirantis_openstack_ocata_holdback_xenial_source: http://apt.mirantis.com/xenial/openstack/ocata/holdback/
-    mirror_mirantis_openstack_ocata_holdback_xenial_distribution: ${_param:apt_mk_version}
+    mirror_mirantis_openstack_ocata_holdback_xenial_distribution: ${_param:mcp_version}
     mirror_mirantis_openstack_ocata_holdback_xenial_components: main restricted
     mirror_mirantis_openstack_ocata_holdback_xenial_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mirantis_openstack_ocata_holdback_xenial_gpgkeys:
@@ -48,7 +48,7 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-xenial/openstack/ocata/${_param:apt_mk_version}
+              - ubuntu-xenial/openstack/ocata/${_param:mcp_version}
 
         mirantis_openstack_ocata_hotfix_xenial:
           source: ${_param:mirror_mirantis_openstack_ocata_hotfix_xenial_source}
@@ -60,7 +60,7 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-xenial/openstack/ocata/hotfix/${_param:apt_mk_version}
+              - ubuntu-xenial/openstack/ocata/hotfix/${_param:mcp_version}
 
         mirantis_openstack_ocata_security_xenial:
           source: ${_param:mirror_mirantis_openstack_ocata_security_xenial_source}
@@ -72,7 +72,7 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-xenial/openstack/ocata/security/${_param:apt_mk_version}
+              - ubuntu-xenial/openstack/ocata/security/${_param:mcp_version}
 
         # required for alternative horizon plugins/etc..
         mirantis_openstack_ocata_updates_xenial:
@@ -85,7 +85,7 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-xenial/openstack/ocata/updates/${_param:apt_mk_version}
+              - ubuntu-xenial/openstack/ocata/updates/${_param:mcp_version}
 
         # required for salt formulas
         mirantis_openstack_ocata_holdback_xenial:
@@ -98,5 +98,5 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-xenial/openstack/ocata/holdback/${_param:apt_mk_version}
+              - ubuntu-xenial/openstack/ocata/holdback/${_param:mcp_version}
 
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/openstack/pike.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/openstack/pike.yml
index 0754d8d..6066e81 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/openstack/pike.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/openstack/pike.yml
@@ -2,7 +2,7 @@
   _param:
 
     mirror_mirantis_openstack_pike_xenial_source: http://apt.mirantis.com/xenial/openstack/pike/
-    mirror_mirantis_openstack_pike_xenial_distribution: ${_param:apt_mk_version}
+    mirror_mirantis_openstack_pike_xenial_distribution: ${_param:mcp_version}
     mirror_mirantis_openstack_pike_xenial_components: main
     mirror_mirantis_openstack_pike_xenial_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mirantis_openstack_pike_xenial_gpgkeys:
@@ -20,5 +20,5 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-xenial/openstack/pike/${_param:apt_mk_version}
+              - ubuntu-xenial/openstack/pike/${_param:mcp_version}
 
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/salt.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/salt.yml
index f800395..197de39 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/salt.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/salt.yml
@@ -1,7 +1,7 @@
 parameters:
   _param:
     mirror_mirantis_openstack_xenial_salt_source: http://apt.mirantis.com/xenial/
-    mirror_mirantis_openstack_xenial_salt_distribution: ${_param:apt_mk_version}
+    mirror_mirantis_openstack_xenial_salt_distribution: ${_param:mcp_version}
     mirror_mirantis_openstack_xenial_salt_components: salt
     mirror_mirantis_openstack_xenial_salt_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mirantis_openstack_xenial_salt_gpgkeys:
@@ -19,4 +19,4 @@
           publisher:
             component: salt
             distributions:
-              - ubuntu-xenial/${_param:apt_mk_version}
\ No newline at end of file
+              - ubuntu-xenial/${_param:mcp_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/saltstack/salt-2016-3.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/saltstack/salt-2016-3.yml
index ed6eaf6..4e45299 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/saltstack/salt-2016-3.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/saltstack/salt-2016-3.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    mirror_mirantis_openstack_xenial_saltstack_2016_3_source: http://mirror.mirantis.com/${_param:apt_mk_version}/saltstack-2016.3/xenial/
+    mirror_mirantis_openstack_xenial_saltstack_2016_3_source: http://mirror.mirantis.com/${_param:mcp_version}/saltstack-2016.3/xenial/
     mirror_mirantis_openstack_xenial_saltstack_2016_3_distribution: xenial
     mirror_mirantis_openstack_xenial_saltstack_2016_3_components: main
     mirror_mirantis_openstack_xenial_saltstack_2016_3_gpgkeys:
@@ -17,4 +17,4 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-xenial/salt/2016.3/${_param:apt_mk_version}
\ No newline at end of file
+              - ubuntu-xenial/salt/2016.3/${_param:mcp_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/saltstack/salt-2017-7.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/saltstack/salt-2017-7.yml
index c03f56e..fb38ea4 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/saltstack/salt-2017-7.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/saltstack/salt-2017-7.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    mirror_mirantis_openstack_xenial_saltstack_2017_7_source: http://mirror.mirantis.com/${_param:apt_mk_version}/saltstack-2017.7/xenial/
+    mirror_mirantis_openstack_xenial_saltstack_2017_7_source: http://mirror.mirantis.com/${_param:mcp_version}/saltstack-2017.7/xenial/
     mirror_mirantis_openstack_xenial_saltstack_2017_7_distribution: xenial
     mirror_mirantis_openstack_xenial_saltstack_2017_7_components: main
     mirror_mirantis_openstack_xenial_saltstack_2017_7_gpgkeys:
@@ -17,4 +17,4 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-xenial/salt/2017.7/${_param:apt_mk_version}
\ No newline at end of file
+              - ubuntu-xenial/salt/2017.7/${_param:mcp_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/sensu.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/sensu.yml
index 32ed975..d8241ff 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/sensu.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/sensu.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    mirror_mirantis_openstack_xenial_sensu_source: http://mirror.mirantis.com/${_param:apt_mk_version}/sensu/xenial/
+    mirror_mirantis_openstack_xenial_sensu_source: http://mirror.mirantis.com/${_param:mcp_version}/sensu/xenial/
     mirror_mirantis_openstack_xenial_sensu_distribution: sensu
     mirror_mirantis_openstack_xenial_sensu_components: main
     mirror_mirantis_openstack_xenial_sensu_key_url: "http://apt.mirantis.com/public.gpg"
@@ -18,4 +18,4 @@
           publisher:
             component: main
             distributions:
-              - ubuntu-xenial/sensu/${_param:apt_mk_version}
\ No newline at end of file
+              - ubuntu-xenial/sensu/${_param:mcp_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/salt.yml b/aptly/server/mirror/ubuntu/xenial/salt.yml
index c209710..1c1f5ab 100644
--- a/aptly/server/mirror/ubuntu/xenial/salt.yml
+++ b/aptly/server/mirror/ubuntu/xenial/salt.yml
@@ -17,4 +17,4 @@
           publisher:
             component: salt
             distributions:
-              - ubuntu-xenial/${_param:apt_mk_version}
\ No newline at end of file
+              - ubuntu-xenial/${_param:mcp_version}
\ No newline at end of file
diff --git a/debmirror/mirror_mirantis_com/cassandra/xenial.yml b/debmirror/mirror_mirantis_com/cassandra/xenial.yml
index 807efd1..4527a63 100644
--- a/debmirror/mirror_mirantis_com/cassandra/xenial.yml
+++ b/debmirror/mirror_mirantis_com/cassandra/xenial.yml
@@ -10,7 +10,7 @@
           method: "rsync"
           arch: [ 'amd64' ]
           mirror_host: "mirror.mirantis.com"
-          mirror_root: ":mirror/${_param:apt_mk_version}/cassandra/xenial/"
+          mirror_root: ":mirror/${_param:mcp_version}/cassandra/xenial/"
           target_dir: "${_param:debmirror_mirrors_base_target_dir}/cassandra/xenial/"
           log_file: "/var/log/debmirror/mirror_mirantis_com_cassandra_xenial.log"
           dist: [ "21x" ]
diff --git a/debmirror/mirror_mirantis_com/ceph-luminous/xenial.yml b/debmirror/mirror_mirantis_com/ceph-luminous/xenial.yml
index fb8facc..ec4bb7d 100644
--- a/debmirror/mirror_mirantis_com/ceph-luminous/xenial.yml
+++ b/debmirror/mirror_mirantis_com/ceph-luminous/xenial.yml
@@ -10,7 +10,7 @@
           method: "rsync"
           arch: [ 'amd64' ]
           mirror_host: "mirror.mirantis.com"
-          mirror_root: ":mirror/${_param:apt_mk_version}/ceph-luminous/xenial/"
+          mirror_root: ":mirror/${_param:mcp_version}/ceph-luminous/xenial/"
           target_dir: "${_param:debmirror_mirrors_base_target_dir}/ceph-luminous/xenial/"
           log_file: "/var/log/debmirror/mirror_mirantis_com_ceph_luminous_xenial.log"
           dist: [ xenial ]
diff --git a/debmirror/mirror_mirantis_com/docker/xenial.yml b/debmirror/mirror_mirantis_com/docker/xenial.yml
index 04d31b3..854a9ef 100644
--- a/debmirror/mirror_mirantis_com/docker/xenial.yml
+++ b/debmirror/mirror_mirantis_com/docker/xenial.yml
@@ -10,7 +10,7 @@
           method: "rsync"
           arch: [ 'amd64' ]
           mirror_host: "mirror.mirantis.com"
-          mirror_root: ":mirror/${_param:apt_mk_version}/docker/xenial/"
+          mirror_root: ":mirror/${_param:mcp_version}/docker/xenial/"
           target_dir: "${_param:debmirror_mirrors_base_target_dir}/docker/xenial/"
           log_file: "/var/log/debmirror/mirror_mirantis_com_docker_xenial.log"
           dist: [ xenial ]
diff --git a/debmirror/mirror_mirantis_com/elasticsearch-5.x/xenial.yml b/debmirror/mirror_mirantis_com/elasticsearch-5.x/xenial.yml
index 89384fb..7fdb6d7 100644
--- a/debmirror/mirror_mirantis_com/elasticsearch-5.x/xenial.yml
+++ b/debmirror/mirror_mirantis_com/elasticsearch-5.x/xenial.yml
@@ -11,7 +11,7 @@
           method: "rsync"
           arch: [ 'amd64' ]
           mirror_host: "mirror.mirantis.com"
-          mirror_root: ":mirror/${_param:apt_mk_version}/elasticsearch-5.x/xenial/"
+          mirror_root: ":mirror/${_param:mcp_version}/elasticsearch-5.x/xenial/"
           target_dir: "${_param:debmirror_mirrors_base_target_dir}/elasticsearch-5.x/xenial/"
           log_file: "/var/log/debmirror/mirror_mirantis_com_elasticsearch_5_x_xenial.log"
           dist: [ stable ]
diff --git a/debmirror/mirror_mirantis_com/elasticsearch-curator-5/xenial.yml b/debmirror/mirror_mirantis_com/elasticsearch-curator-5/xenial.yml
index dfad4ea..5ee8741 100644
--- a/debmirror/mirror_mirantis_com/elasticsearch-curator-5/xenial.yml
+++ b/debmirror/mirror_mirantis_com/elasticsearch-curator-5/xenial.yml
@@ -11,7 +11,7 @@
           method: "rsync"
           arch: [ 'amd64' ]
           mirror_host: "mirror.mirantis.com"
-          mirror_root: ":mirror/${_param:apt_mk_version}/elasticsearch-curator-5/xenial/"
+          mirror_root: ":mirror/${_param:mcp_version}/elasticsearch-curator-5/xenial/"
           target_dir: "${_param:debmirror_mirrors_base_target_dir}/elasticsearch-curator-5/xenial/"
           log_file: "/var/log/debmirror/mirror_mirantis_com_elasticsearch_curator_5_xenial.log"
           dist: [ stable ]
diff --git a/debmirror/mirror_mirantis_com/extra/xenial.yml b/debmirror/mirror_mirantis_com/extra/xenial.yml
index 28a4b7a..9fec707 100644
--- a/debmirror/mirror_mirantis_com/extra/xenial.yml
+++ b/debmirror/mirror_mirantis_com/extra/xenial.yml
@@ -10,7 +10,7 @@
           method: "rsync"
           arch: [ 'amd64' ]
           mirror_host: "mirror.mirantis.com"
-          mirror_root: ":mirror/${_param:apt_mk_version}/extra/xenial/"
+          mirror_root: ":mirror/${_param:mcp_version}/extra/xenial/"
           target_dir: "${_param:debmirror_mirrors_base_target_dir}/extra/xenial/"
           log_file: "/var/log/debmirror/mirror_mirantis_com_extra_xenial.log"
           dist: [ xenial ]
diff --git a/debmirror/mirror_mirantis_com/glusterfs-3.8/xenial.yml b/debmirror/mirror_mirantis_com/glusterfs-3.8/xenial.yml
index a8a5680..fbac95e 100644
--- a/debmirror/mirror_mirantis_com/glusterfs-3.8/xenial.yml
+++ b/debmirror/mirror_mirantis_com/glusterfs-3.8/xenial.yml
@@ -10,7 +10,7 @@
           method: "rsync"
           arch: [ 'amd64' ]
           mirror_host: "mirror.mirantis.com"
-          mirror_root: ":mirror/${_param:apt_mk_version}/glusterfs-3.8/xenial/"
+          mirror_root: ":mirror/${_param:mcp_version}/glusterfs-3.8/xenial/"
           target_dir: "${_param:debmirror_mirrors_base_target_dir}/glusterfs-3.8/xenial/"
           log_file: "/var/log/debmirror/mirror_mirantis_com_glusterfs_3_8_xenial.log"
           dist: [ xenial ]
diff --git a/debmirror/mirror_mirantis_com/maas/xenial.yml b/debmirror/mirror_mirantis_com/maas/xenial.yml
index f90589b..c19c0a2 100644
--- a/debmirror/mirror_mirantis_com/maas/xenial.yml
+++ b/debmirror/mirror_mirantis_com/maas/xenial.yml
@@ -10,7 +10,7 @@
           method: "rsync"
           arch: [ 'amd64' ]
           mirror_host: "mirror.mirantis.com"
-          mirror_root: ":mirror/${_param:apt_mk_version}/maas/xenial/"
+          mirror_root: ":mirror/${_param:mcp_version}/maas/xenial/"
           target_dir: "${_param:debmirror_mirrors_base_target_dir}/maas/xenial/"
           log_file: "/var/log/debmirror/mirror_mirantis_com_maas_xenial.log"
           dist: [ xenial ]
diff --git a/debmirror/mirror_mirantis_com/openstack-pike/xenial.yml b/debmirror/mirror_mirantis_com/openstack-pike/xenial.yml
index c327901..e664637 100644
--- a/debmirror/mirror_mirantis_com/openstack-pike/xenial.yml
+++ b/debmirror/mirror_mirantis_com/openstack-pike/xenial.yml
@@ -10,7 +10,7 @@
           method: "rsync"
           arch: [ 'amd64' ]
           mirror_host: "mirror.mirantis.com"
-          mirror_root: ":mirror/${_param:apt_mk_version}/openstack-pike/xenial/"
+          mirror_root: ":mirror/${_param:mcp_version}/openstack-pike/xenial/"
           target_dir: "${_param:debmirror_mirrors_base_target_dir}/openstack-pike/xenial/"
           log_file: "/var/log/debmirror/mirror_mirantis_com_openstack_pike_xenial.log"
           dist: [ xenial ]
diff --git a/debmirror/mirror_mirantis_com/openstack-queens/xenial.yml b/debmirror/mirror_mirantis_com/openstack-queens/xenial.yml
index 54a8d38..52ea04d 100644
--- a/debmirror/mirror_mirantis_com/openstack-queens/xenial.yml
+++ b/debmirror/mirror_mirantis_com/openstack-queens/xenial.yml
@@ -10,7 +10,7 @@
           method: "rsync"
           arch: [ 'amd64' ]
           mirror_host: "mirror.mirantis.com"
-          mirror_root: ":mirror/${_param:apt_mk_version}/openstack-queens/xenial/"
+          mirror_root: ":mirror/${_param:mcp_version}/openstack-queens/xenial/"
           target_dir: "${_param:debmirror_mirrors_base_target_dir}/openstack-queens/xenial/"
           log_file: "/var/log/debmirror/mirror_mirantis_com_openstack_queens_xenial.log"
           dist: [ xenial ]
diff --git a/debmirror/mirror_mirantis_com/percona/xenial.yml b/debmirror/mirror_mirantis_com/percona/xenial.yml
index 42f5ade..1464dcc 100644
--- a/debmirror/mirror_mirantis_com/percona/xenial.yml
+++ b/debmirror/mirror_mirantis_com/percona/xenial.yml
@@ -10,7 +10,7 @@
           method: "rsync"
           arch: [ 'amd64' ]
           mirror_host: "mirror.mirantis.com"
-          mirror_root: ":mirror/${_param:apt_mk_version}/percona/xenial/"
+          mirror_root: ":mirror/${_param:mcp_version}/percona/xenial/"
           target_dir: "${_param:debmirror_mirrors_base_target_dir}/percona/xenial/"
           log_file: "/var/log/debmirror/mirror_mirantis_com_percona_xenial.log"
           dist: [ xenial ]
diff --git a/debmirror/mirror_mirantis_com/saltstack-2016.3/xenial.yml b/debmirror/mirror_mirantis_com/saltstack-2016.3/xenial.yml
index 9945483..3a3528b 100644
--- a/debmirror/mirror_mirantis_com/saltstack-2016.3/xenial.yml
+++ b/debmirror/mirror_mirantis_com/saltstack-2016.3/xenial.yml
@@ -10,7 +10,7 @@
           method: "rsync"
           arch: [ 'amd64' ]
           mirror_host: "mirror.mirantis.com"
-          mirror_root: ":mirror/${_param:apt_mk_version}/saltstack-2016.3/xenial/"
+          mirror_root: ":mirror/${_param:mcp_version}/saltstack-2016.3/xenial/"
           target_dir: "${_param:debmirror_mirrors_base_target_dir}/saltstack-2016.3/xenial/"
           log_file: "/var/log/debmirror/mirror_mirantis_com_saltstack_2016_3_xenial.log"
           dist: [ xenial ]
diff --git a/debmirror/mirror_mirantis_com/saltstack-2017.7/xenial.yml b/debmirror/mirror_mirantis_com/saltstack-2017.7/xenial.yml
index 13d13c2..19371b4 100644
--- a/debmirror/mirror_mirantis_com/saltstack-2017.7/xenial.yml
+++ b/debmirror/mirror_mirantis_com/saltstack-2017.7/xenial.yml
@@ -10,7 +10,7 @@
           method: "rsync"
           arch: [ 'amd64' ]
           mirror_host: "mirror.mirantis.com"
-          mirror_root: ":mirror/${_param:apt_mk_version}/saltstack-2017.7/xenial/"
+          mirror_root: ":mirror/${_param:mcp_version}/saltstack-2017.7/xenial/"
           target_dir: "${_param:debmirror_mirrors_base_target_dir}/saltstack-2017.7/xenial/"
           log_file: "/var/log/debmirror/mirror_mirantis_com_saltstack_2017_7_xenial.log"
           dist: [ xenial ]
diff --git a/debmirror/mirror_mirantis_com/td-agent/xenial.yml b/debmirror/mirror_mirantis_com/td-agent/xenial.yml
index 6d9a7f2..6c6becd 100644
--- a/debmirror/mirror_mirantis_com/td-agent/xenial.yml
+++ b/debmirror/mirror_mirantis_com/td-agent/xenial.yml
@@ -10,7 +10,7 @@
           method: "rsync"
           arch: [ 'amd64' ]
           mirror_host: "mirror.mirantis.com"
-          mirror_root: ":mirror/${_param:apt_mk_version}/td-agent/xenial/"
+          mirror_root: ":mirror/${_param:mcp_version}/td-agent/xenial/"
           target_dir: "${_param:debmirror_mirrors_base_target_dir}/td-agent/xenial/"
           log_file: "/var/log/debmirror/mirror_mirantis_com_td_agent_xenial.log"
           dist: [ xenial ]
diff --git a/debmirror/mirror_mirantis_com/ubuntu/xenial.yml b/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
index d09c4f8..95806ad 100644
--- a/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
+++ b/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
@@ -11,7 +11,7 @@
           method: "rsync"
           arch: [ 'amd64' ]
           mirror_host: "mirror.mirantis.com"
-          mirror_root: ":mirror/${_param:apt_mk_version}/ubuntu/"
+          mirror_root: ":mirror/${_param:mcp_version}/ubuntu/"
           target_dir: "${_param:debmirror_mirrors_base_target_dir}/ubuntu/"
           log_file: "/var/log/debmirror/mirror_mirantis_com_ubuntu_xenial.log"
           dist: [ xenial , xenial-security, xenial-updates ]
diff --git a/defaults/debmirror.yml b/defaults/debmirror.yml
index 4376529..3995118 100644
--- a/defaults/debmirror.yml
+++ b/defaults/debmirror.yml
@@ -1,7 +1,7 @@
 parameters:
   _param:
     # Global
-    debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
+    debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:mcp_version}/"
     # Per repo modificators
     mirror_mirantis_com_cassandra_xenial_force: False
     mirror_mirantis_com_ceph_luminous_xenial_force: False
diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index a7b4c19..10fd4d9 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -1,20 +1,23 @@
 parameters:
   _param:
     # CI\CD
-    docker_image_compose:    "${_param:mcp_docker_registry}/mirantis/external/compose:${_param:apt_mk_version}"
-    docker_image_registry:   "${_param:mcp_docker_registry}/mirantis/external/registry:${_param:apt_mk_version}"
-    docker_image_visualizer: "${_param:mcp_docker_registry}/mirantis/external/visualizer:${_param:apt_mk_version}"
+    docker_image_compose:    "${_param:mcp_docker_registry}/mirantis/external/compose:${_param:mcp_version}"
+    docker_image_registry:   "${_param:mcp_docker_registry}/mirantis/external/registry:${_param:mcp_version}"
+    docker_image_visualizer: "${_param:mcp_docker_registry}/mirantis/external/visualizer:${_param:mcp_version}"
     # openldap:1.1.8
-    docker_image_openldap: "${_param:mcp_docker_registry}/mirantis/external/openldap:${_param:apt_mk_version}"
+    docker_image_openldap: "${_param:mcp_docker_registry}/mirantis/external/openldap:${_param:mcp_version}"
     # library/postgres:9.6  #G
-    docker_image_postgresql: "${_param:mcp_docker_registry}/mirantis/external/library/postgres:${_param:apt_mk_version}"
+    docker_image_postgresql: "${_param:mcp_docker_registry}/mirantis/external/library/postgres:${_param:mcp_version}"
     # library/mongo:3.4 #G
-    docker_image_mongodb: "${_param:mcp_docker_registry}/mirantis/external/library/mongo:${_param:apt_mk_version}"
+    docker_image_mongodb: "${_param:mcp_docker_registry}/mirantis/external/library/mongo:${_param:mcp_version}"
     ###
     # phpldapadmin:0.6.12
-    docker_image_phpldapadmin: "${_param:mcp_docker_registry}/mirantis/cicd/phpldapadmin:${_param:apt_mk_version}"
+    docker_image_phpldapadmin: "${_param:mcp_docker_registry}/mirantis/cicd/phpldapadmin:${_param:mcp_version}"
     # gerrit:2.13.6
-    docker_image_gerrit: "${_param:mcp_docker_registry}/mirantis/cicd/gerrit:${_param:apt_mk_version}"
+    docker_image_gerrit: "${_param:mcp_docker_registry}/mirantis/cicd/gerrit:${_param:mcp_version}"
     # mysql:5.6
-    docker_image_mysql: "${_param:mcp_docker_registry}/mirantis/cicd/mysql:${_param:apt_mk_version}"
-    docker_image_jenkins_slave: ${_param:mcp_docker_registry}/mirantis/cicd/jnlp-slave:${_param:apt_mk_version}
+    docker_image_mysql: "${_param:mcp_docker_registry}/mirantis/cicd/mysql:${_param:mcp_version}"
+    docker_image_jenkins_slave: ${_param:mcp_docker_registry}/mirantis/cicd/jnlp-slave:${_param:mcp_version}
+    # model-generator
+    docker_image_operations_api: "${_param:mcp_docker_registry}/mirantis/model-generator/operations-api:${_param:mcp_version}"
+    docker_image_operations_ui: "${_param:mcp_docker_registry}/mirantis/model-generator/operations-ui:${_param:mcp_version}"
diff --git a/defaults/init.yml b/defaults/init.yml
index 803df1f..b19f2c8 100644
--- a/defaults/init.yml
+++ b/defaults/init.yml
@@ -15,9 +15,12 @@
 - system.defaults.gerrit
 parameters:
   _param:
-    apt_mk_version: stable
+    mcp_version: stable
+    # Temporary link to mcp_version.
+    # 'apt_mk_version' will be removed in q4
+    apt_mk_version: ${_param:mcp_version}
     linux_system_architecture: amd64
-    linux_system_repo_url: "http://mirror.mirantis.com/${_param:apt_mk_version}/"
+    linux_system_repo_url: "http://mirror.mirantis.com/${_param:mcp_version}/"
     # linux globals
     banner_company_name: COMPANY_NAME
     motd_company_name: "${_param:banner_company_name}"
diff --git a/defaults/linux_system_repo.yml b/defaults/linux_system_repo.yml
index 1194dce..b889b0f 100644
--- a/defaults/linux_system_repo.yml
+++ b/defaults/linux_system_repo.yml
@@ -2,11 +2,11 @@
   _param:
     # Global
     linux_repo_refresh_db: true
-    linux_system_repo_url: http://mirror.mirantis.com/${_param:apt_mk_version}/
+    linux_system_repo_url: http://mirror.mirantis.com/${_param:mcp_version}/
     # Global-updates
-    linux_system_repo_update_url: http://mirror.mirantis.com/update/${_param:apt_mk_version}/
+    linux_system_repo_update_url: http://mirror.mirantis.com/update/${_param:mcp_version}/
     # Global-hotfix
-    linux_system_repo_hotfix_url: http://mirror.mirantis.com/hotfix/${_param:apt_mk_version}/
+    linux_system_repo_hotfix_url: http://mirror.mirantis.com/hotfix/${_param:mcp_version}/
     # Per repos
     linux_system_repo_mcp_aptly_url: ${_param:linux_system_repo_url}/aptly/
     linux_system_repo_mcp_cassandra_url: ${_param:linux_system_repo_url}/cassandra/
diff --git a/docker/swarm/stack/operations_api.yml b/docker/swarm/stack/operations_api.yml
index 74426ad..dd74899 100644
--- a/docker/swarm/stack/operations_api.yml
+++ b/docker/swarm/stack/operations_api.yml
@@ -1,15 +1,19 @@
 parameters:
   _param:
     docker_operations_api_replicas: 1
-    docker_image_operations_api: mirantis/python-operations-api:latest
-    docker_image_operations_ui: mirantis/operations-ui:latest
+    # FIXME: move cockroach image to defaults once it is uploaded to artifactory with proper tag
+    docker_image_cockroachdb: cockroachdb/cockroach:latest
     operations_api_sqlalchemy_database_uri: "cockroachdb://oapi@cockroach-ui:26257/oapi"
     operations_api_sqlalchemy_echo: "false"
     operations_api_flask_debug: "false"
     operations_api_bind_host: 0.0.0.0
     operations_api_bind_port: ${_param:haproxy_operations_api_bind_port}
-    docker_image_cockroachdb: cockroachdb/cockroach:latest
+    operations_api_jenkins_url: http://${_param:single_address}:18081
+    operations_api_jenkins_username: admin
+    operations_api_pipeline_name: deploy_trymcp
     operations_api_keycloak_url: "http://${_param:single_address}:${_param:haproxy_keycloak_exposed_port}"
+    operations_api_model_remote: localfs
+    operations_api_model_path: /code/operations_api/workflow_definition.yml
   docker:
     client:
       stack:
@@ -35,6 +39,12 @@
                 OAPI_FLASK_SECRET_KEY: ${_param:operations_api_flask_secret_key}
                 OAPI_FLASK_SERVER_HOST: ${_param:operations_api_bind_host}
                 OAPI_FLASK_SERVER_PORT: ${_param:operations_api_bind_port}
+                OAPI_MODELFORM_JENKINS_URL: ${_param:operations_api_jenkins_url}
+                OAPI_MODELFORM_JENKINS_USERNAME: ${_param:operations_api_jenkins_username}
+                OAPI_MODELFORM_JENKINS_PASSWORD: ${_param:operations_api_jenkins_password}
+                OAPI_MODELFORM_PIPELINE_NAME: ${_param:operations_api_pipeline_name}
+                OAPI_MODELFORM_REMOTE: ${_param:operations_api_model_remote}
+                OAPI_MODELFORM_PATH: ${_param:operations_api_model_path}
               image: ${_param:docker_image_operations_api}
               deploy:
                 replicas: ${_param:docker_operations_api_replicas}
diff --git a/jenkins/client/job/validate.yml b/jenkins/client/job/validate.yml
index a73b8ad..3003ebb 100644
--- a/jenkins/client/job/validate.yml
+++ b/jenkins/client/job/validate.yml
@@ -203,7 +203,7 @@
               description: Enable if you need to keep container after the test and debug
             IMAGE:
               type: string
-              default: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-sanity-checks:${_param:apt_mk_version}"
+              default: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-sanity-checks:${_param:mcp_version}"
               description: Docker image with tests and all pip dependecies to use for testing
             SALT_MASTER_URL:
               type: string
@@ -473,7 +473,7 @@
               description: Enable if you need to keep container after the test and debug
             IMAGE:
               type: string
-              default: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-spt:${_param:apt_mk_version}"
+              default: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-spt:${_param:mcp_version}"
               description: Docker image with tests and all pip dependecies to use for testing
             SALT_MASTER_URL:
               type: string
diff --git a/kubernetes/common/init.yml b/kubernetes/common/init.yml
index 1a35e84..ded78c7 100644
--- a/kubernetes/common/init.yml
+++ b/kubernetes/common/init.yml
@@ -73,10 +73,10 @@
     kubernetes_calico_cni_image: ${_param:mcp_docker_registry}/mirantis/projectcalico/calico/cni:v3.1.3
     kubernetes_calico_calicoctl_image: ${_param:mcp_docker_registry}/mirantis/projectcalico/calico/ctl:v3.1.3
 
-    kubernetes_opencontrail_controller_image: ${_param:kubernetes_contrail_registry}/opencontrail-controller:${_param:apt_mk_version}
-    kubernetes_opencontrail_analyticsdb_image: ${_param:kubernetes_contrail_registry}/opencontrail-analyticsdb:${_param:apt_mk_version}
-    kubernetes_opencontrail_analytics_image: ${_param:kubernetes_contrail_registry}/opencontrail-analytics:${_param:apt_mk_version}
-    kubernetes_opencontrail_kube_manager_image: ${_param:kubernetes_contrail_registry}/opencontrail-kube-manager:${_param:apt_mk_version}
+    kubernetes_opencontrail_controller_image: ${_param:kubernetes_contrail_registry}/opencontrail-controller:${_param:mcp_version}
+    kubernetes_opencontrail_analyticsdb_image: ${_param:kubernetes_contrail_registry}/opencontrail-analyticsdb:${_param:mcp_version}
+    kubernetes_opencontrail_analytics_image: ${_param:kubernetes_contrail_registry}/opencontrail-analytics:${_param:mcp_version}
+    kubernetes_opencontrail_kube_manager_image: ${_param:kubernetes_contrail_registry}/opencontrail-kube-manager:${_param:mcp_version}
 
     kubelet_fail_on_swap: true
     kubernetes_dashboard_enabled: true
diff --git a/linux/system/repo/mcp/apt_mirantis/ceph.yml b/linux/system/repo/mcp/apt_mirantis/ceph.yml
index 12011ac..6c578a9 100644
--- a/linux/system/repo/mcp/apt_mirantis/ceph.yml
+++ b/linux/system/repo/mcp/apt_mirantis/ceph.yml
@@ -16,7 +16,7 @@
 # Deprecated since 2018.11+
 #parameters:
 #  _param:
-#    linux_system_repo_mcp_ceph_version: ${_param:apt_mk_version}
+#    linux_system_repo_mcp_ceph_version: ${_param:mcp_version}
 #    linux_system_repo_mcp_ceph_codename: luminous
 #  linux:
 #    system:
diff --git a/linux/system/repo/mcp/apt_mirantis/elastic/2x.yml b/linux/system/repo/mcp/apt_mirantis/elastic/2x.yml
index cd996c7..2d6aa0c 100644
--- a/linux/system/repo/mcp/apt_mirantis/elastic/2x.yml
+++ b/linux/system/repo/mcp/apt_mirantis/elastic/2x.yml
@@ -4,7 +4,7 @@
 - system.linux.system.repo.keystorage.elasticsearch
 parameters:
   _param:
-    linux_system_repo_mcp_elastic_2x_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_elastic_2x_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo/mcp/apt_mirantis/elastic/5x.yml b/linux/system/repo/mcp/apt_mirantis/elastic/5x.yml
index 5156087..c3c0ea1 100644
--- a/linux/system/repo/mcp/apt_mirantis/elastic/5x.yml
+++ b/linux/system/repo/mcp/apt_mirantis/elastic/5x.yml
@@ -4,7 +4,7 @@
 - system.linux.system.repo.keystorage.elasticsearch
 parameters:
   _param:
-    linux_system_repo_mcp_elastic_5x_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_elastic_5x_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo/mcp/apt_mirantis/grafana.yml b/linux/system/repo/mcp/apt_mirantis/grafana.yml
index 755347b..73f8d15 100644
--- a/linux/system/repo/mcp/apt_mirantis/grafana.yml
+++ b/linux/system/repo/mcp/apt_mirantis/grafana.yml
@@ -2,7 +2,7 @@
 # Will be removed in 2018q4
 #parameters:
 #  _param:
-#    linux_system_repo_mcp_grafana_version: ${_param:apt_mk_version}
+#    linux_system_repo_mcp_grafana_version: ${_param:mcp_version}
 #  linux:
 #    system:
 #      repo:
diff --git a/linux/system/repo/mcp/apt_mirantis/kibana/46.yml b/linux/system/repo/mcp/apt_mirantis/kibana/46.yml
index 219c0dc..4389579 100644
--- a/linux/system/repo/mcp/apt_mirantis/kibana/46.yml
+++ b/linux/system/repo/mcp/apt_mirantis/kibana/46.yml
@@ -2,7 +2,7 @@
 - system.linux.system.repo.keystorage.elasticsearch
 parameters:
   _param:
-    linux_system_repo_mcp_kibana_46_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_kibana_46_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo/mcp/apt_mirantis/openstack.yml b/linux/system/repo/mcp/apt_mirantis/openstack.yml
index c1483ac..381e37b 100644
--- a/linux/system/repo/mcp/apt_mirantis/openstack.yml
+++ b/linux/system/repo/mcp/apt_mirantis/openstack.yml
@@ -16,7 +16,7 @@
 # DEPRECATED since 2018.10+ release.
 #parameters:
 #  _param:
-#    linux_system_repo_mk_openstack_version: ${_param:apt_mk_version}
+#    linux_system_repo_mk_openstack_version: ${_param:mcp_version}
 #  linux:
 #    system:
 #      repo:
diff --git a/linux/system/repo/mcp/apt_mirantis/sensu.yml b/linux/system/repo/mcp/apt_mirantis/sensu.yml
index fe2ad07..89e1501 100644
--- a/linux/system/repo/mcp/apt_mirantis/sensu.yml
+++ b/linux/system/repo/mcp/apt_mirantis/sensu.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    linux_system_repo_mcp_sensu_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_sensu_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo/mcp/contrail.yml b/linux/system/repo/mcp/contrail.yml
index 18b7cfb..3211f78 100644
--- a/linux/system/repo/mcp/contrail.yml
+++ b/linux/system/repo/mcp/contrail.yml
@@ -1,7 +1,7 @@
 parameters:
   _param:
     linux_repo_contrail_component: oc311
-    linux_system_repo_mcp_contrail_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_contrail_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo/mcp/extra.yml b/linux/system/repo/mcp/extra.yml
index abd6948..b4004da 100644
--- a/linux/system/repo/mcp/extra.yml
+++ b/linux/system/repo/mcp/extra.yml
@@ -2,7 +2,7 @@
 - system.linux.system.repo.keystorage.mirantis_com
 parameters:
   _param:
-    linux_system_repo_mcp_extra_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_extra_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo/mcp/openstack.yml b/linux/system/repo/mcp/openstack.yml
index 3e82a68..74e31f4 100644
--- a/linux/system/repo/mcp/openstack.yml
+++ b/linux/system/repo/mcp/openstack.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    linux_system_repo_mk_openstack_version: ${_param:apt_mk_version}
+    linux_system_repo_mk_openstack_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo/mcp/salt/init.yml b/linux/system/repo/mcp/salt/init.yml
index 17fd50b..3430a5c 100644
--- a/linux/system/repo/mcp/salt/init.yml
+++ b/linux/system/repo/mcp/salt/init.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    linux_system_repo_mcp_salt_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_salt_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo/mcp/updates.yml b/linux/system/repo/mcp/updates.yml
index 870d8d2..d60e17c 100644
--- a/linux/system/repo/mcp/updates.yml
+++ b/linux/system/repo/mcp/updates.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    linux_system_repo_mcp_updates_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_updates_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/ceph.yml b/linux/system/repo_local/ceph.yml
index d28c0b6..1817909 100644
--- a/linux/system/repo_local/ceph.yml
+++ b/linux/system/repo_local/ceph.yml
@@ -4,6 +4,6 @@
       repo:
         ceph:
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:apt_mk_version} ceph-mirantis"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:mcp_version} ceph-mirantis"
           architectures: amd64
           key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo_local/docker.yml b/linux/system/repo_local/docker.yml
index 6254dec..e739f36 100644
--- a/linux/system/repo_local/docker.yml
+++ b/linux/system/repo_local/docker.yml
@@ -6,6 +6,6 @@
       repo:
         docker:
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:apt_mk_version} docker"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:mcp_version} docker"
           architectures: amd64
           key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo_local/docker_legacy.yml b/linux/system/repo_local/docker_legacy.yml
index 3df198f..98ef1f1 100644
--- a/linux/system/repo_local/docker_legacy.yml
+++ b/linux/system/repo_local/docker_legacy.yml
@@ -6,6 +6,6 @@
       repo:
         docker:
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:apt_mk_version} docker-legacy"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:mcp_version} docker-legacy"
           architectures: amd64
           key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo_local/elasticsearch.yml b/linux/system/repo_local/elasticsearch.yml
index 8dc78aa..168cc04 100644
--- a/linux/system/repo_local/elasticsearch.yml
+++ b/linux/system/repo_local/elasticsearch.yml
@@ -4,6 +4,6 @@
       repo:
         elasticsearch:
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_system_codename}/ ${_param:apt_mk_version} elastic"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_system_codename}/ ${_param:mcp_version} elastic"
           architectures: amd64
           key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo_local/glusterfs.yml b/linux/system/repo_local/glusterfs.yml
index 5d0ecd3..b3bb6c3 100644
--- a/linux/system/repo_local/glusterfs.yml
+++ b/linux/system/repo_local/glusterfs.yml
@@ -6,6 +6,6 @@
       repo:
         glusterfs:
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:apt_mk_version} glusterfs"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:mcp_version} glusterfs"
           architectures: amd64
           key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo_local/grafana.yml b/linux/system/repo_local/grafana.yml
index f2d9ad5..59ef857 100644
--- a/linux/system/repo_local/grafana.yml
+++ b/linux/system/repo_local/grafana.yml
@@ -4,6 +4,6 @@
       repo:
         grafana:
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:apt_mk_version} grafana"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:mcp_version} grafana"
           architectures: amd64
           key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo_local/influxdb.yml b/linux/system/repo_local/influxdb.yml
index 1c641bb..08c06fc 100644
--- a/linux/system/repo_local/influxdb.yml
+++ b/linux/system/repo_local/influxdb.yml
@@ -4,6 +4,6 @@
       repo:
         influxdb:
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:apt_mk_version} influxdb"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:mcp_version} influxdb"
           architectures: amd64
           key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo_local/maas.yml b/linux/system/repo_local/maas.yml
index 1a5b487..23605d6 100644
--- a/linux/system/repo_local/maas.yml
+++ b/linux/system/repo_local/maas.yml
@@ -6,6 +6,6 @@
       repo:
         maas:
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_system_codename}/ ${_param:apt_mk_version} maas"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_system_codename}/ ${_param:mcp_version} maas"
           architectures: amd64
           key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo_local/mcp/apt_mirantis/aptly.yml b/linux/system/repo_local/mcp/apt_mirantis/aptly.yml
index ee248a0..852e280 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/aptly.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/aptly.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    linux_system_repo_mcp_aptly_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_aptly_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/mcp/apt_mirantis/cassandra.yml b/linux/system/repo_local/mcp/apt_mirantis/cassandra.yml
index c3a00c6..67f95ad 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/cassandra.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/cassandra.yml
@@ -2,7 +2,7 @@
 # Please use system/repo/mcp/apt_mirantis
 parameters:
   _param:
-    linux_system_repo_mcp_cassandra_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_cassandra_version: ${_param:mcp_version}
     linux_system_repo_mcp_cassandra_version_number: "21x"
   linux:
     system:
diff --git a/linux/system/repo_local/mcp/apt_mirantis/ceph.yml b/linux/system/repo_local/mcp/apt_mirantis/ceph.yml
index f0380cb..bfb3897 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/ceph.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/ceph.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    linux_system_repo_mcp_ceph_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_ceph_version: ${_param:mcp_version}
     linux_system_repo_mcp_ceph_codename: luminous
   linux:
     system:
diff --git a/linux/system/repo_local/mcp/apt_mirantis/docker.yml b/linux/system/repo_local/mcp/apt_mirantis/docker.yml
index 638fb0c..16f0645 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/docker.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/docker.yml
@@ -2,7 +2,7 @@
 # Please use system/repo/mcp/apt_mirantis
 parameters:
   _param:
-    linux_system_repo_mcp_docker_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_docker_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/mcp/apt_mirantis/docker_legacy.yml b/linux/system/repo_local/mcp/apt_mirantis/docker_legacy.yml
index 887f8fd..6cdbe7c 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/docker_legacy.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/docker_legacy.yml
@@ -2,7 +2,7 @@
 # Please use system/repo/mcp/apt_mirantis
 parameters:
   _param:
-    linux_system_repo_mcp_docker_legacy_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_docker_legacy_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/mcp/apt_mirantis/elastic/2x.yml b/linux/system/repo_local/mcp/apt_mirantis/elastic/2x.yml
index 63e2717..4fb0d78 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/elastic/2x.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/elastic/2x.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    linux_system_repo_mcp_elastic_2x_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_elastic_2x_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/mcp/apt_mirantis/elastic/5x.yml b/linux/system/repo_local/mcp/apt_mirantis/elastic/5x.yml
index b04886e..b578d8b 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/elastic/5x.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/elastic/5x.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    linux_system_repo_mcp_elastic_5x_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_elastic_5x_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/mcp/apt_mirantis/fluentd.yml b/linux/system/repo_local/mcp/apt_mirantis/fluentd.yml
index ad1fb6c..417c86c 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/fluentd.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/fluentd.yml
@@ -1,11 +1,11 @@
 parameters:
   _param:
-    linux_system_repo_mcp_fluentd_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_fluentd_version: ${_param:mcp_version}
   linux:
     system:
       repo:
         mcp_fluentd:
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/fluentd ${_param:apt_mk_version} contrib"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/fluentd ${_param:mcp_version} contrib"
           architectures: amd64
           key_url: "http://${_param:local_repo_url}/public.gpg"
           clean_file: true
diff --git a/linux/system/repo_local/mcp/apt_mirantis/glusterfs.yml b/linux/system/repo_local/mcp/apt_mirantis/glusterfs.yml
index b1eceed..0aacbfa 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/glusterfs.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/glusterfs.yml
@@ -2,7 +2,7 @@
 # Please use system/repo/mcp/apt_mirantis
 parameters:
   _param:
-    linux_system_repo_mcp_glusterfs_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_glusterfs_version: ${_param:mcp_version}
     linux_system_repo_mcp_glusterfs_version_number: "3.8"
   linux:
     system:
diff --git a/linux/system/repo_local/mcp/apt_mirantis/grafana.yml b/linux/system/repo_local/mcp/apt_mirantis/grafana.yml
index d924500..98a80b0 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/grafana.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/grafana.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    linux_system_repo_mcp_grafana_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_grafana_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/mcp/apt_mirantis/influxdb.yml b/linux/system/repo_local/mcp/apt_mirantis/influxdb.yml
index e99664d..c770f1e 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/influxdb.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/influxdb.yml
@@ -2,7 +2,7 @@
 # Please use system/repo/mcp/apt_mirantis
 parameters:
   _param:
-    linux_system_repo_mcp_influxdb_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_influxdb_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/mcp/apt_mirantis/kibana/46.yml b/linux/system/repo_local/mcp/apt_mirantis/kibana/46.yml
index 799c0a2..9f4ec80 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/kibana/46.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/kibana/46.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    linux_system_repo_mcp_kibana_46_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_kibana_46_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/mcp/apt_mirantis/kibana/5x.yml b/linux/system/repo_local/mcp/apt_mirantis/kibana/5x.yml
index 59410f4..f4aaa5a 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/kibana/5x.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/kibana/5x.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    linux_system_repo_mcp_kibana_5x_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_kibana_5x_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/mcp/apt_mirantis/maas.yml b/linux/system/repo_local/mcp/apt_mirantis/maas.yml
index 0c9b2eb..1de20dc 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/maas.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/maas.yml
@@ -2,7 +2,7 @@
 # Please use system/repo/mcp/apt_mirantis
 parameters:
   _param:
-    linux_system_repo_mcp_maas_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_maas_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/mcp/apt_mirantis/openstack.yml b/linux/system/repo_local/mcp/apt_mirantis/openstack.yml
index 2a40b38..d50a759 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/openstack.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/openstack.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    linux_system_repo_mk_openstack_version: ${_param:apt_mk_version}
+    linux_system_repo_mk_openstack_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/mcp/apt_mirantis/saltstack.yml b/linux/system/repo_local/mcp/apt_mirantis/saltstack.yml
index 181ec40..76c6ea1 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/saltstack.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/saltstack.yml
@@ -3,7 +3,7 @@
 parameters:
   _param:
     salt_version: 2017.7
-    linux_system_repo_mcp_saltstack_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_saltstack_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/mcp/apt_mirantis/saltstack_2016_3.yml b/linux/system/repo_local/mcp/apt_mirantis/saltstack_2016_3.yml
index be21433..efb215f 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/saltstack_2016_3.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/saltstack_2016_3.yml
@@ -2,7 +2,7 @@
 # Please use system/repo/mcp/apt_mirantis
 parameters:
   _param:
-    linux_system_repo_mcp_saltstack_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_saltstack_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/mcp/apt_mirantis/sensu.yml b/linux/system/repo_local/mcp/apt_mirantis/sensu.yml
index a634cd6..f662d88 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/sensu.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/sensu.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    linux_system_repo_mcp_extra_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_extra_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/mcp/apt_mirantis/ubuntu.yml b/linux/system/repo_local/mcp/apt_mirantis/ubuntu.yml
index 483006e..b6d721d 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/ubuntu.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/ubuntu.yml
@@ -10,16 +10,16 @@
       repo:
         ubuntu:
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:apt_mk_version}/ubuntu ${_param:linux_system_codename} main universe restricted"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:mcp_version}/ubuntu ${_param:linux_system_codename} main universe restricted"
           architectures: amd64
           default: true
         ubuntu_updates:
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:apt_mk_version}/ubuntu ${_param:linux_system_codename}-updates main universe restricted"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:mcp_version}/ubuntu ${_param:linux_system_codename}-updates main universe restricted"
           architectures: amd64
           default: true
         ubuntu_security:
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:apt_mk_version}/ubuntu ${_param:linux_system_codename}-security main universe restricted"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:mcp_version}/ubuntu ${_param:linux_system_codename}-security main universe restricted"
           architectures: amd64
           default: true
diff --git a/linux/system/repo_local/mcp/ceph.yml b/linux/system/repo_local/mcp/ceph.yml
index 89308ad..31b60ba 100644
--- a/linux/system/repo_local/mcp/ceph.yml
+++ b/linux/system/repo_local/mcp/ceph.yml
@@ -4,6 +4,6 @@
       repo:
         ceph:
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:apt_mk_version} ceph"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:mcp_version} ceph"
           architectures: amd64
           key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo_local/mcp/contrail.yml b/linux/system/repo_local/mcp/contrail.yml
index 1443a4d..0f16826 100644
--- a/linux/system/repo_local/mcp/contrail.yml
+++ b/linux/system/repo_local/mcp/contrail.yml
@@ -2,7 +2,7 @@
   _param:
     linux_repo_contrail_component: oc311
     contrail_repo_pin_priority: 200
-    linux_system_repo_mcp_contrail_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_contrail_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/mcp/extra.yml b/linux/system/repo_local/mcp/extra.yml
index fd90ef9..26972a4 100644
--- a/linux/system/repo_local/mcp/extra.yml
+++ b/linux/system/repo_local/mcp/extra.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    linux_system_repo_mcp_extra_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_extra_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/mcp/openstack.yml b/linux/system/repo_local/mcp/openstack.yml
index 7818ef1..bd4a9b4 100644
--- a/linux/system/repo_local/mcp/openstack.yml
+++ b/linux/system/repo_local/mcp/openstack.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    linux_system_repo_mk_openstack_version: ${_param:apt_mk_version}
+    linux_system_repo_mk_openstack_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/mcp/salt/init.yml b/linux/system/repo_local/mcp/salt/init.yml
index 44a382d..79a4e8d 100644
--- a/linux/system/repo_local/mcp/salt/init.yml
+++ b/linux/system/repo_local/mcp/salt/init.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    linux_system_repo_mcp_salt_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_salt_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/mcp/updates.yml b/linux/system/repo_local/mcp/updates.yml
index e5915ff..7348110 100644
--- a/linux/system/repo_local/mcp/updates.yml
+++ b/linux/system/repo_local/mcp/updates.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    linux_system_repo_mcp_updates_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_updates_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/sensu.yml b/linux/system/repo_local/sensu.yml
index 67750cf..2e56fbd 100644
--- a/linux/system/repo_local/sensu.yml
+++ b/linux/system/repo_local/sensu.yml
@@ -4,6 +4,6 @@
       repo:
         sensu:
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:apt_mk_version} sensu"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:mcp_version} sensu"
           architectures: amd64
           key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/maas/region/boot_sources/maas_ephemeral_v3/init.yml b/maas/region/boot_sources/maas_ephemeral_v3/init.yml
index 8ed76c5..7406486 100644
--- a/maas/region/boot_sources/maas_ephemeral_v3/init.yml
+++ b/maas/region/boot_sources/maas_ephemeral_v3/init.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    maas_region_boot_sources_maas_ephemeral_v3_bs_url: http://mirror.mirantis.com/${_param:apt_mk_version}/maas-ephemeral-v3/
+    maas_region_boot_sources_maas_ephemeral_v3_bs_url: http://mirror.mirantis.com/${_param:mcp_version}/maas-ephemeral-v3/
   maas:
     region:
       boot_sources_delete_all_others: true
diff --git a/maas/region/single.yml b/maas/region/single.yml
index 3569fff..74bcea1 100644
--- a/maas/region/single.yml
+++ b/maas/region/single.yml
@@ -4,7 +4,7 @@
 parameters:
   _param:
     maas_admin_username: mirantis
-    maas_region_main_archive: http://mirror.mirantis.com/${_param:apt_mk_version}/ubuntu/
+    maas_region_main_archive: http://mirror.mirantis.com/${_param:mcp_version}/ubuntu/
   maas:
     cluster:
       enabled: true