diff --git a/linux/system/repo/contrail.yml b/linux/system/repo/contrail.yml
index 6c16a12..b282fc8 100644
--- a/linux/system/repo/contrail.yml
+++ b/linux/system/repo/contrail.yml
@@ -1,15 +1,10 @@
 parameters:
   _param:
     linux_repo_contrail_component: oc30
-    contrail_repo_pin_priority: 200
   linux:
     system:
       repo:
-        mirantis_opencontrail:
-          source: "deb http://apt-mk.mirantis.com/nightly/ ${_param:linux_system_codename} extra ${_param:linux_repo_contrail_component}"
+        tcpcloud_opencontrail:
+          source: "deb [arch=amd64] http://apt.tcpcloud.eu/nightly/ ${_param:linux_system_codename} extra ${_param:linux_repo_contrail_component}"
           architectures: amd64
-          key_url: "http://apt-mk.mirantis.com/public.gpg"
-          pin:
-          - pin: "release c=${_param:linux_repo_contrail_component}"
-            priority: ${_param:contrail_repo_pin_priority}
-            package: "*"
+          key_url: "http://apt.tcpcloud.eu/public.gpg"
diff --git a/linux/system/repo_local/mcp/contrail.yml b/linux/system/repo_local/mcp/contrail.yml
index 554c033..158fda5 100644
--- a/linux/system/repo_local/mcp/contrail.yml
+++ b/linux/system/repo_local/mcp/contrail.yml
@@ -1,27 +1,13 @@
 parameters:
   _param:
+    linux_repo_contrail_component: oc311
     contrail_repo_pin_priority: 200
     apt_mk_version: stable
   linux:
     system:
       repo:
-        mcp_opencontrail_oc311:
+        mcp_opencontrail_${_param:linux_repo_contrail_component}:
           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} oc311"
-          architectures: amd64
-          key_url: "http://${_param:local_repo_url}/public.gpg"
-        mcp_opencontrail_oc31:
-          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} oc31"
-          architectures: amd64
-          key_url: "http://${_param:local_repo_url}/public.gpg"
-        mcp_opencontrail_oc32:
-          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} oc32"
-          architectures: amd64
-          key_url: "http://${_param:local_repo_url}/public.gpg"
-        mcp_opencontrail_oc303:
-          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} oc303"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:apt_mk_version} ${_param:linux_repo_contrail_component}"
           architectures: amd64
           key_url: "http://${_param:local_repo_url}/public.gpg"