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: