diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk.yml
index bec2ee1..553e6dd 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk.yml
@@ -5,7 +5,7 @@
     server:
       mirror:
         # required for opencontrail formulas
-        mcp_opencontrail_trusty_${_param:apt_mk_version}_oc311:
+        mcp_opencontrail_trusty_oc311:
           source: http://apt-mk.mirantis.com/trusty/
           distribution: ${_param:apt_mk_version}
           components: oc311
@@ -17,7 +17,7 @@
             component: oc311
             distributions:
               - ubuntu-trusty/${_param:apt_mk_version}
-        mcp_opencontrail_trusty_${_param:apt_mk_version}_oc31:
+        mcp_opencontrail_trusty_oc31:
           source: http://apt-mk.mirantis.com/trusty/
           distribution: ${_param:apt_mk_version}
           components: oc31
@@ -29,7 +29,7 @@
             component: oc31
             distributions:
               - ubuntu-trusty/${_param:apt_mk_version}
-        mcp_opencontrail_trusty_${_param:apt_mk_version}_oc32:
+        mcp_opencontrail_trusty_oc32:
           source: http://apt-mk.mirantis.com/trusty/
           distribution: ${_param:apt_mk_version}
           components: oc32
@@ -41,7 +41,7 @@
             component: oc32
             distributions:
               - ubuntu-trusty/${_param:apt_mk_version}
-        mcp_opencontrail_trusty_${_param:apt_mk_version}_oc303:
+        mcp_opencontrail_trusty_oc303:
           source: http://apt-mk.mirantis.com/trusty/
           distribution: ${_param:apt_mk_version}
           components: oc303
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk.yml
index 9ad5490..6272b69 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk.yml
@@ -5,7 +5,7 @@
     server:
       mirror:
         # required for opencontrail formulas
-        mcp_opencontrail_xenial_${_param:apt_mk_version}_oc311:
+        mcp_opencontrail_xenial_oc311:
           source: http://apt-mk.mirantis.com/xenial/
           distribution: ${_param:apt_mk_version}
           components: oc311
@@ -17,7 +17,7 @@
             component: oc311
             distributions:
               - ubuntu-xenial/${_param:apt_mk_version}
-        mcp_opencontrail_xenial_${_param:apt_mk_version}_oc31:
+        mcp_opencontrail_xenial_oc31:
           source: http://apt-mk.mirantis.com/xenial/
           distribution: ${_param:apt_mk_version}
           components: oc31
@@ -29,7 +29,7 @@
             component: oc31
             distributions:
               - ubuntu-xenial/${_param:apt_mk_version}
-        mcp_opencontrail_xenial_${_param:apt_mk_version}_oc32:
+        mcp_opencontrail_xenial_oc32:
           source: http://apt-mk.mirantis.com/xenial/
           distribution: ${_param:apt_mk_version}
           components: oc32
@@ -41,7 +41,7 @@
             component: oc32
             distributions:
               - ubuntu-xenial/${_param:apt_mk_version}
-        mcp_opencontrail_xenial_${_param:apt_mk_version}_oc303:
+        mcp_opencontrail_xenial_oc303:
           source: http://apt-mk.mirantis.com/xenial/
           distribution: ${_param:apt_mk_version}
           components: oc303