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