diff --git a/aptly/server/mirror/debian/aptly.yml b/aptly/server/mirror/debian/aptly.yml
index e919b20..48a176e 100644
--- a/aptly/server/mirror/debian/aptly.yml
+++ b/aptly/server/mirror/debian/aptly.yml
@@ -12,5 +12,5 @@
           publisher:
             component: extra
             distributions:
-              - nightly/trusty
-              - nightly/xenial
+              - trusty/nightly
+              - xenial/nightly
diff --git a/aptly/server/mirror/debian/cassandra.yml b/aptly/server/mirror/debian/cassandra.yml
index 3659536..3d32e6a 100644
--- a/aptly/server/mirror/debian/cassandra.yml
+++ b/aptly/server/mirror/debian/cassandra.yml
@@ -14,5 +14,5 @@
           publisher:
             component: extra
             distributions:
-              - nightly/trusty
-              - nightly/xenial
+              - trusty/nightly
+              - xenial/nightly
diff --git a/aptly/server/mirror/debian/elasticsearch.yml b/aptly/server/mirror/debian/elasticsearch.yml
index 2050c35..942b70a 100644
--- a/aptly/server/mirror/debian/elasticsearch.yml
+++ b/aptly/server/mirror/debian/elasticsearch.yml
@@ -12,8 +12,8 @@
           publisher:
             component: elastic
             distributions:
-              - nightly/trusty
-              - nightly/xenial
+              - trusty/nightly
+              - xenial/nightly
         kibana:
           source: http://packages.elasticsearch.org/kibana/4.4/debian
           distribution: stable
@@ -24,8 +24,8 @@
           publisher:
             component: elastic
             distributions:
-              - nightly/trusty
-              - nightly/xenial
+              - trusty/nightly
+              - xenial/nightly
         kibana-46:
           source: http://packages.elasticsearch.org/kibana/4.6/debian
           distribution: stable
@@ -36,8 +36,8 @@
           publisher:
             component: elastic
             distributions:
-              - nightly/trusty
-              - nightly/xenial
+              - trusty/nightly
+              - xenial/nightly
         elasticsearch-curator:
           source: http://packages.elastic.co/curator/4/debian
           distribution: stable
@@ -48,5 +48,5 @@
           publisher:
             component: elastic
             distributions:
-              - nightly/trusty
-              - nightly/xenial
+              - trusty/nightly
+              - xenial/nightly
diff --git a/aptly/server/mirror/debian/jenkins.yml b/aptly/server/mirror/debian/jenkins.yml
index 1c6ee8c..f04f4d9 100644
--- a/aptly/server/mirror/debian/jenkins.yml
+++ b/aptly/server/mirror/debian/jenkins.yml
@@ -12,8 +12,8 @@
           publisher:
             component: extra
             distributions:
-              - nightly/trusty
-              - nightly/xenial
+              - trusty/nightly
+              - xenial/nightly
         jenkins-debian-glue:
           source: http://jenkins.grml.org/debian/
           distribution: jenkins-debian-glue
@@ -26,5 +26,5 @@
           publisher:
             component: extra
             distributions:
-              - nightly/trusty
-              - nightly/xenial
+              - trusty/nightly
+              - xenial/nightly
diff --git a/aptly/server/mirror/debian/sensu.yml b/aptly/server/mirror/debian/sensu.yml
index fac40f7..10f3926 100644
--- a/aptly/server/mirror/debian/sensu.yml
+++ b/aptly/server/mirror/debian/sensu.yml
@@ -12,5 +12,5 @@
           publisher:
             component: extra
             distributions:
-              - nightly/trusty
-              - nightly/xenial
+              - trusty/nightly
+              - xenial/nightly
diff --git a/aptly/server/mirror/ubuntu/trusty/ceph.yml b/aptly/server/mirror/ubuntu/trusty/ceph.yml
index 0b4d7c3..b2bae2d 100644
--- a/aptly/server/mirror/ubuntu/trusty/ceph.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ceph.yml
@@ -10,6 +10,6 @@
           gpgkeys:
             - 460F3994
           publisher:
-            component: extra
+            component: ceph
             distributions:
-              - nightly/trusty
+              - trusty/nightly
diff --git a/aptly/server/mirror/ubuntu/trusty/docker.yml b/aptly/server/mirror/ubuntu/trusty/docker.yml
index 5fc2a76..91879dc 100644
--- a/aptly/server/mirror/ubuntu/trusty/docker.yml
+++ b/aptly/server/mirror/ubuntu/trusty/docker.yml
@@ -10,6 +10,6 @@
           gpgkeys:
             - 58118E89F3A912897C070ADBF76221572C52609D
           publisher:
-            component: extra
+            component: docker
             distributions:
-              - nightly/trusty
+              - trusty/nightly
diff --git a/aptly/server/mirror/ubuntu/trusty/erlang.yml b/aptly/server/mirror/ubuntu/trusty/erlang.yml
index aba5e03..afbcb2e 100644
--- a/aptly/server/mirror/ubuntu/trusty/erlang.yml
+++ b/aptly/server/mirror/ubuntu/trusty/erlang.yml
@@ -10,6 +10,6 @@
           gpgkeys:
             - A14F4FCA
           publisher:
-            component: extra
+            component: erlang
             distributions:
-              - nightly/trusty
+              - trusty/nightly
diff --git a/aptly/server/mirror/ubuntu/trusty/foreman.yml b/aptly/server/mirror/ubuntu/trusty/foreman.yml
index fa9658b..3a36a86 100644
--- a/aptly/server/mirror/ubuntu/trusty/foreman.yml
+++ b/aptly/server/mirror/ubuntu/trusty/foreman.yml
@@ -12,7 +12,7 @@
           publisher:
             component: extra
             distributions:
-              - nightly/trusty
+              - trusty/nightly
         foreman-plugins-trusty:
           source: http://deb.theforeman.org
           distribution: plugins
@@ -23,4 +23,4 @@
           publisher:
             component: extra
             distributions:
-              - nightly/trusty
+              - trusty/nightly
diff --git a/aptly/server/mirror/ubuntu/trusty/galera.yml b/aptly/server/mirror/ubuntu/trusty/galera.yml
index d4686e1..6d9786d 100644
--- a/aptly/server/mirror/ubuntu/trusty/galera.yml
+++ b/aptly/server/mirror/ubuntu/trusty/galera.yml
@@ -10,6 +10,6 @@
           gpgkeys:
             - BC19DDBA
           publisher:
-            component: extra
+            component: galera
             distributions:
-              - nightly/trusty
+              - trusty-galera
diff --git a/aptly/server/mirror/ubuntu/trusty/grafana.yml b/aptly/server/mirror/ubuntu/trusty/grafana.yml
index 65afab9..c743eb0 100644
--- a/aptly/server/mirror/ubuntu/trusty/grafana.yml
+++ b/aptly/server/mirror/ubuntu/trusty/grafana.yml
@@ -10,6 +10,6 @@
           gpgkeys:
             - D59097AB
           publisher:
-            component: extra
+            component: grafana
             distributions:
-              - nightly/trusty
+              - trusty/nightly
diff --git a/aptly/server/mirror/ubuntu/trusty/haproxy.yml b/aptly/server/mirror/ubuntu/trusty/haproxy.yml
index e69fa20..30f43c1 100644
--- a/aptly/server/mirror/ubuntu/trusty/haproxy.yml
+++ b/aptly/server/mirror/ubuntu/trusty/haproxy.yml
@@ -10,6 +10,6 @@
           gpgkeys:
             - 1C61B9CD
           publisher:
-            component: extra
+            component: haproxy
             distributions:
-              - nightly/trusty
+              - trusty-haproxy
diff --git a/aptly/server/mirror/ubuntu/trusty/mos8.yml b/aptly/server/mirror/ubuntu/trusty/mos8.yml
index 7c9fe1a..bf9faaf 100644
--- a/aptly/server/mirror/ubuntu/trusty/mos8.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mos8.yml
@@ -8,58 +8,56 @@
           components: main restricted
           architectures: amd64
           gpgkeys:
-            - EC4926EA
+            - 1FA22B08
           publisher:
             component: main
             distributions:
-              - mos8.0
-        mirantis-openstack-8.0-trusty:
-          source: http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0-mu-3/
-          distribution: mos8.0
-          components: main restricted
-          architectures: amd64
-          key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0-mu-3/archive-mos8.0.key"
-          publisher:
-            component: main
-            distributions:
-              - mos8.0
+              - mos8/mos8.0
         mirantis-openstack-8.0-hotfix-trusty:
           source: http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0-mu-3/
           distribution: mos8.0-hotfix
           components: main restricted
           architectures: amd64
           key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0-mu-3/archive-mos8.0.key"
+          gpgkeys:
+            - 1FA22B08
           publisher:
             component: main
             distributions:
-              - mos8.0-hotfix
+              - mos8/mos8.0-hotfix
         mirantis-openstack-8.0-proposed-trusty:
           source: http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0-mu-3/
           distribution: mos8.0-proposed
           components: main restricted
           architectures: amd64
           key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0-mu-3/archive-mos8.0.key"
+          gpgkeys:
+            - 1FA22B08
           publisher:
             component: main
             distributions:
-              - mos8.0-proposed
+              - mos8/mos8.0-proposed
         mirantis-openstack-8.0-security-trusty:
           source: http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0-mu-3/
           distribution: mos8.0-security
           components: main restricted
           architectures: amd64
           key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0-mu-3/archive-mos8.0.key"
+          gpgkeys:
+            - 1FA22B08
           publisher:
             component: main
             distributions:
-              - mos8.0-security
+              - mos8/mos8.0-security
         mirantis-openstack-8.0-updates-trusty:
           source: http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0-mu-3/
           distribution: mos8.0-updates
           components: main restricted
           architectures: amd64
           key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0-mu-3/archive-mos8.0.key"
+          gpgkeys:
+            - 1FA22B08
           publisher:
             component: main
             distributions:
-              - mos8.0-updates
+              - mos8/mos8.0-updates
diff --git a/aptly/server/mirror/ubuntu/trusty/mos9.yml b/aptly/server/mirror/ubuntu/trusty/mos9.yml
index e9aeddb..8920e3a 100644
--- a/aptly/server/mirror/ubuntu/trusty/mos9.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mos9.yml
@@ -8,58 +8,68 @@
           components: main restricted
           architectures: amd64
           gpgkeys:
-            - EC4926EA
+            - 1FA22B08
           publisher:
             component: main
             distributions:
-              - mos9.0
-        mirantis-openstack-9.0-trusty:
-          source: http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/
-          distribution: mos9.0
-          components: main restricted
-          architectures: amd64
-          key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/archive-mos9.0.key"
-          publisher:
-            component: main
-            distributions:
-              - mos9.0
+              - mos9/mos9.0
         mirantis-openstack-9.0-hotfix-trusty:
           source: http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/
           distribution: mos9.0-hotfix
           components: main restricted
           architectures: amd64
           key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/archive-mos9.0.key"
+          gpgkeys:
+            - 1FA22B08
           publisher:
             component: main
             distributions:
-              - mos9.0-hotfix
+              - mos9/mos9.0-hotfix
         mirantis-openstack-9.0-proposed-trusty:
           source: http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/
           distribution: mos9.0-proposed
           components: main restricted
           architectures: amd64
           key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/archive-mos9.0.key"
+          gpgkeys:
+            - 1FA22B08
           publisher:
             component: main
             distributions:
-              - mos9.0-proposed
+              - mos9/mos9.0-proposed
         mirantis-openstack-9.0-security-trusty:
           source: http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/
           distribution: mos9.0-security
           components: main restricted
           architectures: amd64
           key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/archive-mos9.0.key"
+          gpgkeys:
+            - 1FA22B08
           publisher:
             component: main
             distributions:
-              - mos9.0-security
+              - mos9/mos9.0-security
         mirantis-openstack-9.0-updates-trusty:
           source: http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/
           distribution: mos9.0-updates
           components: main restricted
           architectures: amd64
           key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/archive-mos9.0.key"
+          gpgkeys:
+            - 1FA22B08
           publisher:
             component: main
             distributions:
-              - mos9.0-updates
+              - mos9/mos9.0-updates
+        mirantis-openstack-9.0-extras-murano:
+          source: http://mirror.fuel-infra.org/extras/murano-plugin-repos/release/1.1.0/ubuntu/9.0/
+          distribution: mos9.0
+          components: main restricted
+          architectures: amd64
+          key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/archive-mos9.0.key"
+          gpgkeys:
+            - 1FA22B08
+          publisher:
+            component: murano
+            distributions:
+              - mos9/mos9.0
diff --git a/aptly/server/mirror/ubuntu/trusty/rabbitmq.yml b/aptly/server/mirror/ubuntu/trusty/rabbitmq.yml
index 17b0f07..e5d8eca 100644
--- a/aptly/server/mirror/ubuntu/trusty/rabbitmq.yml
+++ b/aptly/server/mirror/ubuntu/trusty/rabbitmq.yml
@@ -10,6 +10,6 @@
           gpgkeys:
             - 056E8E56
           publisher:
-            component: extra
+            component: rabbitmq
             distributions:
-              - nightly/trusty
+              - trusty/nightly
diff --git a/aptly/server/mirror/ubuntu/trusty/salt.yml b/aptly/server/mirror/ubuntu/trusty/salt.yml
index 8c46007..76458bc 100644
--- a/aptly/server/mirror/ubuntu/trusty/salt.yml
+++ b/aptly/server/mirror/ubuntu/trusty/salt.yml
@@ -2,14 +2,15 @@
   aptly:
     server:
       mirror:
-        salt-2015.8-trusty:
-          source: http://repo.saltstack.com/apt/ubuntu/ubuntu14/2015.8/
+        salt-2016.3-trusty:
+          source: http://repo.saltstack.com/apt/ubuntu/14.04/amd64/2016.3
           distribution: trusty
           components: main
           architectures: amd64
           gpgkeys:
             - DE57BFBE
           publisher:
-            component: extra
+            component: salt
             distributions:
-              - nightly/trusty
+              - trusty/nightly
+
diff --git a/aptly/server/mirror/ubuntu/trusty/sssd.yml b/aptly/server/mirror/ubuntu/trusty/sssd.yml
index 06e17d7..7d60c8f 100644
--- a/aptly/server/mirror/ubuntu/trusty/sssd.yml
+++ b/aptly/server/mirror/ubuntu/trusty/sssd.yml
@@ -12,4 +12,4 @@
           publisher:
             component: extra
             distributions:
-              - nightly/trusty
+              - trusty/nightly
diff --git a/aptly/server/mirror/ubuntu/trusty/tcpcloud.yml b/aptly/server/mirror/ubuntu/trusty/tcpcloud.yml
new file mode 100644
index 0000000..3fea40b
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/tcpcloud.yml
@@ -0,0 +1,95 @@
+parameters:
+  aptly:
+    server:
+      mirror:
+
+        #TOOD: 4x the lower below
+        #tcpcloud-[stable/testing]-xxx-[trusty/xenial]:
+        #
+        # Other components
+        # salt tcp-salt extra liberty mitaka oc30 security mitaka
+
+        tcpcloud-nightly-main-trusty:
+          source: http://apt.tcpcloud.eu/nightly
+          distribution: trusty
+            #TODO: extra component might not be needed; tcp is just for heka
+          components: main security tcp
+          architectures: amd64
+          key_url: "http://apt.tcpcloud.eu/public.gpg"
+          gpgkeys:
+            - 3EF02D1C
+          publisher:
+            component: tcp
+            distributions:
+              - trusty/nightly
+
+        tcpcloud-nightly-extra-trusty:
+          source: http://apt.tcpcloud.eu/nightly
+          distribution: trusty
+            #TODO: extra component might not be needed; tcp is just for heka
+          components: extra
+          architectures: amd64
+          key_url: "http://apt.tcpcloud.eu/public.gpg"
+          gpgkeys:
+            - 3EF02D1C
+          publisher:
+            component: tcp-extra
+            distributions:
+              - trusty/nightly
+
+        # required for alternative horizon plugins/etc..
+        tcpcloud-nightly-liberty-trusty:
+          source: http://apt.tcpcloud.eu/nightly
+          distribution: trusty
+          components: liberty
+          architectures: amd64
+          key_url: "http://apt.tcpcloud.eu/public.gpg"
+          gpgkeys:
+            - 3EF02D1C
+          publisher:
+            component: tcp-liberty
+            distributions:
+              - trusty/nightly
+
+        # required for salt formulas
+        tcpcloud-nightly-salt-trusty:
+          source: http://apt.tcpcloud.eu/nightly
+          distribution: trusty
+          components: tcp-salt
+          architectures: amd64
+          key_url: "http://apt.tcpcloud.eu/public.gpg"
+          gpgkeys:
+          - 3EF02D1C
+          publisher:
+            component: tcp-salt
+            distributions:
+              - trusty/nightly
+
+        # required for opencontrail formulas
+        tcpcloud-nightly-oc30-trusty:
+          source: http://apt.tcpcloud.eu/nightly
+          distribution: trusty
+          components: oc30
+          architectures: amd64
+          key_url: "http://apt.tcpcloud.eu/public.gpg"
+          gpgkeys:
+            - 3EF02D1C
+          publisher:
+            component: tcp-oc30
+            distributions:
+              - trusty/nightly
+
+        # elastic, kibana is there
+        tcpcloud-nightly-elastic-trusty:
+          source: http://apt.tcpcloud.eu/nightly
+          distribution: trusty
+          components: elastic
+          architectures: amd64
+          key_url: "http://apt.tcpcloud.eu/public.gpg"
+          gpgkeys:
+            - 3EF02D1C
+          publisher:
+            component: tcp-elastic
+            distributions:
+              - trusty/nightly
+
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu.yml
index d4e9ba5..486e341 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu.yml
@@ -2,8 +2,9 @@
   aptly:
     server:
       mirror:
+        # trusty
         trusty-main:
-          source: http://cz.archive.ubuntu.com/ubuntu/
+          source: http://in.archive.ubuntu.com/ubuntu/
           distribution: trusty
           components: main
           architectures: amd64
@@ -14,9 +15,35 @@
           publisher:
             component: main
             distributions:
-              - nightly/trusty
+              - ubuntu/trusty
+        #trusty-multiverse:
+        #  source: http://in.archive.ubuntu.com/ubuntu/
+        #  distribution: trusty
+        #  components: multiverse
+        #  architectures: amd64
+        #  gpgkeys:
+        #    - 40976EAF437D05B5
+        #    - 437D05B5
+        #    - C0B21F32
+        #  publisher:
+        #    component: multiverse
+        #    distributions:
+        #      - ubuntu/trusty
+        trusty-restricted:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: trusty
+          components: restricted
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: restricted
+            distributions:
+              - ubuntu/trusty
         trusty-universe:
-          source: http://cz.archive.ubuntu.com/ubuntu/
+          source: http://in.archive.ubuntu.com/ubuntu/
           distribution: trusty
           components: universe
           architectures: amd64
@@ -25,11 +52,13 @@
             - 437D05B5
             - C0B21F32
           publisher:
-            component: main
+            component: universe
             distributions:
-              - nightly/trusty
-        trusty-updates:
-          source: http://cz.archive.ubuntu.com/ubuntu/
+              - ubuntu/trusty
+
+        # trusty-updates
+        trusty-updates-main:
+          source: http://in.archive.ubuntu.com/ubuntu/
           distribution: trusty-updates
           components: main
           architectures: amd64
@@ -40,9 +69,35 @@
           publisher:
             component: main
             distributions:
-              - nightly/trusty
+              - ubuntu/trusty-updates
+        #trusty-updates-multiverse:
+        #  source: http://in.archive.ubuntu.com/ubuntu/
+        #  distribution: trusty-updates
+        #  components: multiverse
+        #  architectures: amd64
+        #  gpgkeys:
+        #    - 40976EAF437D05B5
+        #    - 437D05B5
+        #    - C0B21F32
+        #  publisher:
+        #    component: multiverse
+        #    distributions:
+        #      - ubuntu/trusty-updates
+        trusty-updates-restricted:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: trusty-updates
+          components: restricted
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: restricted
+            distributions:
+              - ubuntu/trusty-updates
         trusty-updates-universe:
-          source: http://cz.archive.ubuntu.com/ubuntu/
+          source: http://in.archive.ubuntu.com/ubuntu/
           distribution: trusty-updates
           components: universe
           architectures: amd64
@@ -51,11 +106,13 @@
             - 437D05B5
             - C0B21F32
           publisher:
-            component: main
+            component: universe
             distributions:
-              - nightly/trusty
-        trusty-security:
-          source: http://cz.archive.ubuntu.com/ubuntu/
+              - ubuntu/trusty-updates
+
+        #trusty-security:
+        trusty-security-main:
+          source: http://in.archive.ubuntu.com/ubuntu/
           distribution: trusty-security
           components: main
           architectures: amd64
@@ -64,6 +121,154 @@
             - 437D05B5
             - C0B21F32
           publisher:
-            component: security
+            component: main
             distributions:
-              - nightly/trusty
+              - ubuntu/trusty-security
+        #trusty-security-multiverse:
+        #  source: http://in.archive.ubuntu.com/ubuntu/
+        #  distribution: trusty-security
+        #  components: multiverse
+        #  architectures: amd64
+        #  gpgkeys:
+        #    - 40976EAF437D05B5
+        #    - 437D05B5
+        #    - C0B21F32
+        #  publisher:
+        #    component: multiverse
+        #    distributions:
+        #      - ubuntu/trusty-security
+        trusty-security-restricted:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: trusty-security
+          components: restricted
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: restricted
+            distributions:
+              - ubuntu/trusty-security
+        trusty-security-universe:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: trusty-security
+          components: universe
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: universe
+            distributions:
+              - ubuntu/trusty-security
+
+        #trusty-proposed:
+        trusty-proposed-main:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: trusty-proposed
+          components: main
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: main
+            distributions:
+              - ubuntu/trusty-proposed
+        #trusty-proposed-multiverse:
+        #  source: http://in.archive.ubuntu.com/ubuntu/
+        #  distribution: trusty-proposed
+        #  components: multiverse
+        #  architectures: amd64
+        #  gpgkeys:
+        #    - 40976EAF437D05B5
+        #    - 437D05B5
+        #    - C0B21F32
+        #  publisher:
+        #    component: multiverse
+        #    distributions:
+        #      - ubuntu/trusty-proposed
+        trusty-proposed-restricted:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: trusty-proposed
+          components: restricted
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: restricted
+            distributions:
+              - ubuntu/trusty-proposed
+        trusty-proposed-universe:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: trusty-proposed
+          components: universe
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: universe
+            distributions:
+              - ubuntu/trusty-proposed
+
+        #trusty-backports:
+        trusty-backports-main:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: trusty-backports
+          components: main
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: main
+            distributions:
+              - ubuntu/trusty-backports
+        #trusty-backports-multiverse:
+        #  source: http://in.archive.ubuntu.com/ubuntu/
+        #  distribution: trusty-backports
+        #  components: multiverse
+        #  architectures: amd64
+        #  gpgkeys:
+        #    - 40976EAF437D05B5
+        #    - 437D05B5
+        #    - C0B21F32
+        #  publisher:
+        #    component: multiverse
+        #    distributions:
+        #      - ubuntu/trusty-backports
+        trusty-backports-restricted:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: trusty-backports
+          components: restricted
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: restricted
+            distributions:
+              - ubuntu/trusty-backports
+        trusty-backports-universe:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: trusty-backports
+          components: universe
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: universe
+            distributions:
+              - ubuntu/trusty-backports
+
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntucloud.yml b/aptly/server/mirror/ubuntu/trusty/ubuntucloud.yml
index 2fefde0..e940d37 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntucloud.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntucloud.yml
@@ -2,28 +2,28 @@
   aptly:
     server:
       mirror:
-        trusty-updates-juno:
-          source: http://ubuntu-cloud.archive.canonical.com/ubuntu/
-          distribution: trusty-updates/juno
-          components: main
-          architectures: amd64
-          gpgkeys:
-            - EC4926EA
-          publisher:
-            component: juno
-            distributions:
-              - nightly/trusty
-        trusty-updates-kilo:
-          source: http://ubuntu-cloud.archive.canonical.com/ubuntu/
-          distribution: trusty-updates/kilo
-          components: main
-          architectures: amd64
-          gpgkeys:
-            - EC4926EA
-          publisher:
-            component: kilo
-            distributions:
-              - nightly/trusty
+        #trusty-updates-juno:
+        #  source: http://ubuntu-cloud.archive.canonical.com/ubuntu/
+        #  distribution: trusty-updates/juno
+        #  components: main
+        #  architectures: amd64
+        #  gpgkeys:
+        #    - EC4926EA
+        #  publisher:
+        #    component: juno
+        #    distributions:
+        #      - trusty
+        #trusty-updates-kilo:
+        #  source: http://ubuntu-cloud.archive.canonical.com/ubuntu/
+        #  distribution: trusty-updates/kilo
+        #  components: main
+        #  architectures: amd64
+        #  gpgkeys:
+        #    - EC4926EA
+        #  publisher:
+        #    component: kilo
+        #    distributions:
+        #      - trusty
         trusty-updates-liberty:
           source: http://ubuntu-cloud.archive.canonical.com/ubuntu/
           distribution: trusty-updates/liberty
@@ -34,7 +34,7 @@
           publisher:
             component: liberty
             distributions:
-              - nightly/trusty
+              - trusty/nightly
         trusty-updates-mitaka:
           source: http://ubuntu-cloud.archive.canonical.com/ubuntu/
           distribution: trusty-updates/mitaka
@@ -45,4 +45,4 @@
           publisher:
             component: mitaka
             distributions:
-              - nightly/trusty
+              - trusty/nightly
diff --git a/aptly/server/mirror/ubuntu/xenial/ceph.yml b/aptly/server/mirror/ubuntu/xenial/ceph.yml
index 53d2ae8..7e9422e 100644
--- a/aptly/server/mirror/ubuntu/xenial/ceph.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ceph.yml
@@ -10,6 +10,6 @@
           gpgkeys:
             - 460F3994
           publisher:
-            component: extra
+            component: ceph
             distributions:
-              - nightly/xenial
+              - xenial/nightly
diff --git a/aptly/server/mirror/ubuntu/xenial/docker.yml b/aptly/server/mirror/ubuntu/xenial/docker.yml
index 64bf728..d420dfe 100644
--- a/aptly/server/mirror/ubuntu/xenial/docker.yml
+++ b/aptly/server/mirror/ubuntu/xenial/docker.yml
@@ -10,6 +10,6 @@
           gpgkeys:
             - 58118E89F3A912897C070ADBF76221572C52609D
           publisher:
-            component: extra
+            component: docker
             distributions:
-              - nightly/xenial
+              - xenial/nightly
diff --git a/aptly/server/mirror/ubuntu/xenial/grafana.yml b/aptly/server/mirror/ubuntu/xenial/grafana.yml
index ffee38c..58702d3 100644
--- a/aptly/server/mirror/ubuntu/xenial/grafana.yml
+++ b/aptly/server/mirror/ubuntu/xenial/grafana.yml
@@ -10,6 +10,6 @@
           gpgkeys:
             - D59097AB
           publisher:
-            component: extra
+            component: grafana
             distributions:
-              - nightly/xenial
+              - xenial/nightly
diff --git a/aptly/server/mirror/ubuntu/xenial/influxdb.yml b/aptly/server/mirror/ubuntu/xenial/influxdb.yml
index 70b4d26..e70b60d 100644
--- a/aptly/server/mirror/ubuntu/xenial/influxdb.yml
+++ b/aptly/server/mirror/ubuntu/xenial/influxdb.yml
@@ -10,6 +10,6 @@
           gpgkeys:
             - 2582E0C5
           publisher:
-            component: extra
+            component: influxdb
             distributions:
-              - nightly/xenial
+              - xenial/nightly
diff --git a/aptly/server/mirror/ubuntu/xenial/salt.yml b/aptly/server/mirror/ubuntu/xenial/salt.yml
index e41459f..2fd1507 100644
--- a/aptly/server/mirror/ubuntu/xenial/salt.yml
+++ b/aptly/server/mirror/ubuntu/xenial/salt.yml
@@ -10,6 +10,6 @@
           gpgkeys:
             - DE57BFBE
           publisher:
-            component: extra
+            component: salt
             distributions:
-              - nightly/xenial
+              - xenial/nightly
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu.yml
index b202450..871f133 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu.yml
@@ -2,8 +2,9 @@
   aptly:
     server:
       mirror:
+        # xenial
         xenial-main:
-          source: http://cz.archive.ubuntu.com/ubuntu/
+          source: http://in.archive.ubuntu.com/ubuntu/
           distribution: xenial
           components: main
           architectures: amd64
@@ -14,9 +15,35 @@
           publisher:
             component: main
             distributions:
-              - nightly/xenial
+              - ubuntu/xenial
+        #xenial-multiverse:
+        #  source: http://in.archive.ubuntu.com/ubuntu/
+        #  distribution: xenial
+        #  components: multiverse
+        #  architectures: amd64
+        #  gpgkeys:
+        #    - 40976EAF437D05B5
+        #    - 437D05B5
+        #    - C0B21F32
+        #  publisher:
+        #    component: multiverse
+        #    distributions:
+        #      - ubuntu/xenial
+        xenial-restricted:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: xenial
+          components: restricted
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: restricted
+            distributions:
+              - ubuntu/xenial
         xenial-universe:
-          source: http://cz.archive.ubuntu.com/ubuntu/
+          source: http://in.archive.ubuntu.com/ubuntu/
           distribution: xenial
           components: universe
           architectures: amd64
@@ -25,11 +52,13 @@
             - 437D05B5
             - C0B21F32
           publisher:
-            component: main
+            component: universe
             distributions:
-              - nightly/xenial
-        xenial-updates:
-          source: http://cz.archive.ubuntu.com/ubuntu/
+              - ubuntu/xenial
+
+        # xenial-updates
+        xenial-updates-main:
+          source: http://in.archive.ubuntu.com/ubuntu/
           distribution: xenial-updates
           components: main
           architectures: amd64
@@ -40,9 +69,35 @@
           publisher:
             component: main
             distributions:
-              - nightly/xenial
+              - ubuntu/xenial-updates
+        #xenial-updates-multiverse:
+        #  source: http://in.archive.ubuntu.com/ubuntu/
+        #  distribution: xenial-updates
+        #  components: multiverse
+        #  architectures: amd64
+        #  gpgkeys:
+        #    - 40976EAF437D05B5
+        #    - 437D05B5
+        #    - C0B21F32
+        #  publisher:
+        #    component: multiverse
+        #    distributions:
+        #      - ubuntu/xenial-updates
+        xenial-updates-restricted:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: xenial-updates
+          components: restricted
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: restricted
+            distributions:
+              - ubuntu/xenial-updates
         xenial-updates-universe:
-          source: http://cz.archive.ubuntu.com/ubuntu/
+          source: http://in.archive.ubuntu.com/ubuntu/
           distribution: xenial-updates
           components: universe
           architectures: amd64
@@ -51,11 +106,13 @@
             - 437D05B5
             - C0B21F32
           publisher:
-            component: main
+            component: universe
             distributions:
-              - nightly/xenial
-        xenial-security:
-          source: http://cz.archive.ubuntu.com/ubuntu/
+              - ubuntu/xenial-updates
+
+        #xenial-security:
+        xenial-security-main:
+          source: http://in.archive.ubuntu.com/ubuntu/
           distribution: xenial-security
           components: main
           architectures: amd64
@@ -64,6 +121,153 @@
             - 437D05B5
             - C0B21F32
           publisher:
-            component: security
+            component: main
             distributions:
-              - nightly/xenial
+              - ubuntu/xenial-security
+        #xenial-security-multiverse:
+        #  source: http://in.archive.ubuntu.com/ubuntu/
+        #  distribution: xenial-security
+        #  components: multiverse
+        #  architectures: amd64
+        #  gpgkeys:
+        #    - 40976EAF437D05B5
+        #    - 437D05B5
+        #    - C0B21F32
+        #  publisher:
+        #    component: multiverse
+        #    distributions:
+        #      - ubuntu/xenial-security
+        xenial-security-restricted:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: xenial-security
+          components: restricted
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: restricted
+            distributions:
+              - ubuntu/xenial-security
+        xenial-security-universe:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: xenial-security
+          components: universe
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: universe
+            distributions:
+              - ubuntu/xenial-security
+
+        #xenial-proposed:
+        xenial-proposed-main:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: xenial-proposed
+          components: main
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: main
+            distributions:
+              - ubuntu/xenial-proposed
+        #xenial-proposed-multiverse:
+        #  source: http://in.archive.ubuntu.com/ubuntu/
+        #  distribution: xenial-proposed
+        #  components: multiverse
+        #  architectures: amd64
+        #  gpgkeys:
+        #    - 40976EAF437D05B5
+        #    - 437D05B5
+        #    - C0B21F32
+        #  publisher:
+        #    component: multiverse
+        #    distributions:
+        #      - ubuntu/xenial-proposed
+        xenial-proposed-restricted:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: xenial-proposed
+          components: restricted
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: restricted
+            distributions:
+              - ubuntu/xenial-proposed
+        xenial-proposed-universe:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: xenial-proposed
+          components: universe
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: universe
+            distributions:
+              - ubuntu/xenial-proposed
+
+        #xenial-backports:
+        xenial-backports-main:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: xenial-backports
+          components: main
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: main
+            distributions:
+              - ubuntu/xenial-backports
+        #xenial-backports-multiverse:
+        #  source: http://in.archive.ubuntu.com/ubuntu/
+        #  distribution: xenial-backports
+        #  components: multiverse
+        #  architectures: amd64
+        #  gpgkeys:
+        #    - 40976EAF437D05B5
+        #    - 437D05B5
+        #    - C0B21F32
+        #  publisher:
+        #    component: multiverse
+        #    distributions:
+        #      - ubuntu/xenial-backports
+        xenial-backports-restricted:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: xenial-backports
+          components: restricted
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: restricted
+            distributions:
+              - ubuntu/xenial-backports
+        xenial-backports-universe:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: xenial-backports
+          components: universe
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: universe
+            distributions:
+              - ubuntu/xenial-backports
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntucloud.yml b/aptly/server/mirror/ubuntu/xenial/ubuntucloud.yml
new file mode 100644
index 0000000..5a3f171
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntucloud.yml
@@ -0,0 +1,26 @@
+parameters:
+  aptly:
+    server:
+      mirror:
+        xenial-updates-newton:
+          source: http://ubuntu-cloud.archive.canonical.com/ubuntu/
+          distribution: xenial-updates/newton
+          components: main
+          architectures: amd64
+          gpgkeys:
+            - EC4926EA
+          publisher:
+            component: newton
+            distributions:
+              - xenial/nightly
+        xenial-updates-ocata:
+          source: http://ubuntu-cloud.archive.canonical.com/ubuntu/
+          distribution: xenial-updates/ocata
+          components: main
+          architectures: amd64
+          gpgkeys:
+            - EC4926EA
+          publisher:
+            component: ocata
+            distributions:
+              - xenial/nightly
diff --git a/aptly/server/repo/ubuntu/trusty/contrail.yml b/aptly/server/repo/ubuntu/trusty/contrail.yml
new file mode 100644
index 0000000..5678516
--- /dev/null
+++ b/aptly/server/repo/ubuntu/trusty/contrail.yml
@@ -0,0 +1,13 @@
+parameters:
+  aptly:
+    server:
+      repo:
+        contrail:
+          distribution: trusty
+          component: main
+          architectures: amd64
+          comment: "Local Contrail APT repository"
+          publisher:
+            component: jc30
+            distributions:
+              - local/trusty
diff --git a/linux/system/repo-local/contrail.yml b/linux/system/repo-local/contrail.yml
new file mode 100644
index 0000000..c78e68c
--- /dev/null
+++ b/linux/system/repo-local/contrail.yml
@@ -0,0 +1,13 @@
+parameters:
+  _param:
+    contrail_repo_pin_priority: 200
+  linux:
+    system:
+      repo:
+        contrail:
+          refresh_db: ${_param:linux_repo_refresh_db}
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/contrail trusty main"
+          pin:
+          - pin: 'release l=Local Contrail APT repository'
+            priority: ${_param:contrail_repo_pin_priority}
+            package: '*'
diff --git a/linux/system/repo-local/elasticsearch.yml b/linux/system/repo-local/elasticsearch.yml
new file mode 100644
index 0000000..118e4e5
--- /dev/null
+++ b/linux/system/repo-local/elasticsearch.yml
@@ -0,0 +1,9 @@
+parameters:
+  linux:
+    system:
+      repo:
+        tcpcloud_elasticsearch:
+          refresh_db: ${_param:linux_repo_refresh_db}
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_distrib_codename}/ nightly tcp-elastic"
+          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
new file mode 100644
index 0000000..4a07383
--- /dev/null
+++ b/linux/system/repo-local/grafana.yml
@@ -0,0 +1,9 @@
+parameters:
+  linux:
+    system:
+      repo:
+        grafana:
+          refresh_db: ${_param:linux_repo_refresh_db}
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_distrib_codename}/ nightly grafana"
+          architectures: amd64
+          key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo-local/horizon.yml b/linux/system/repo-local/horizon.yml
new file mode 100644
index 0000000..3f6f477
--- /dev/null
+++ b/linux/system/repo-local/horizon.yml
@@ -0,0 +1,10 @@
+parameters:
+  linux:
+    system:
+      repo:
+        tcpcloud_horizon:
+          refresh_db: ${_param:linux_repo_refresh_db}
+          source: "deb [arch=amd64] http://apt.tcpcloud.eu/nightly/ ${_param:linux_distrib_codename} ${_param:horizon_version}"
+          architectures: amd64
+          #key_url: "http://apt.tcpcloud.eu/public.gpg"
+          key_url: "salt://tcpcloud_public.gpg"
diff --git a/linux/system/repo-local/mos9.yml b/linux/system/repo-local/mos9.yml
new file mode 100644
index 0000000..6886185
--- /dev/null
+++ b/linux/system/repo-local/mos9.yml
@@ -0,0 +1,53 @@
+parameters:
+  linux:
+    system:
+      repo:
+        mos9_openstack:
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/mos9/ mos9.0 main"
+          architectures: amd64
+          key_url: "http://${_param:local_repo_url}/public.gpg"
+          pin:
+          - pin: 'release s=mos9.0'
+            priority: 1100
+            package: '*'
+        mos9_openstack_hotfix:
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/mos9/ mos9.0-hotfix main"
+          architectures: amd64
+          key_url: "http://${_param:local_repo_url}/public.gpg"
+          pin:
+          - pin: 'release s=mos9.0-hotfix'
+            priority: 1100
+            package: '*'
+        mos9_openstack_proposed:
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/mos9/ mos9.0-proposed main"
+          architectures: amd64
+          key_url: "http://${_param:local_repo_url}/public.gpg"
+          pin:
+          - pin: 'release s=mos9.0-proposed'
+            priority: 1100
+            package: '*'
+        mos9_openstack_security:
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/mos9/ mos9.0-security main"
+          architectures: amd64
+          key_url: "http://${_param:local_repo_url}/public.gpg"
+          pin:
+          - pin: 'release s=mos9.0-security'
+            priority: 1100
+            package: '*'
+        mos9_openstack_updates:
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/mos9/ mos9.0-updates main"
+          architectures: amd64
+          key_url: "http://${_param:local_repo_url}/public.gpg"
+          pin:
+          - pin: 'release s=mos9.0-updates'
+            priority: 1100
+            package: '*'
+        mos9_murano:
+          refresh_db: ${_param:linux_repo_refresh_db}
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/mos9/ mos9.0 murano"
+          architectures: amd64
+          key_url: "http://${_param:local_repo_url}/public.gpg"
+          pin:
+          - pin: 'release s=mos8.0-proposed'
+            priority: 1100
+            package: '*'
diff --git a/linux/system/repo-local/opencontrail.yml b/linux/system/repo-local/opencontrail.yml
new file mode 100644
index 0000000..90d47a0
--- /dev/null
+++ b/linux/system/repo-local/opencontrail.yml
@@ -0,0 +1,10 @@
+parameters:
+  linux:
+    system:
+      repo:
+        tcpcloud_contrail:
+          # oc30 is now by default
+          refresh_db: ${_param:linux_repo_refresh_db}
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_distrib_codename}/ nightly tcp-oc30"
+          architectures: amd64
+          key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo-local/openstack.yml b/linux/system/repo-local/openstack.yml
new file mode 100644
index 0000000..4754d12
--- /dev/null
+++ b/linux/system/repo-local/openstack.yml
@@ -0,0 +1,51 @@
+classes:
+- system.linux.system.repo.salt
+parameters:
+  linux:
+    system:
+      repo:
+        mirantis:
+          refresh_db: ${_param:linux_repo_refresh_db}
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/mos8/ mos8.0 main"
+          architectures: amd64
+          key_url: "http://${_param:local_repo_url}/public.gpg"
+          pin:
+          - pin: 'release s=mos8.0'
+            priority: 1000
+            package: '*'
+        mirantis_openstack_hotfix:
+          refresh_db: ${_param:linux_repo_refresh_db}
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/mos8/ mos8.0-hotfix main"
+          architectures: amd64
+          key_url: "http://${_param:local_repo_url}/public.gpg"
+          pin:
+          - pin: 'release s=mos8.0-hotfix'
+            priority: 1000
+            package: '*'
+        mirantis_openstack_proposed:
+          refresh_db: ${_param:linux_repo_refresh_db}
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/mos8/ mos8.0-proposed main"
+          architectures: amd64
+          key_url: "http://${_param:local_repo_url}/public.gpg"
+          pin:
+          - pin: 'release s=mos8.0-proposed'
+            priority: 1000
+            package: '*'
+        mirantis_openstack_security:
+          refresh_db: ${_param:linux_repo_refresh_db}
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/mos8/ mos8.0-security main"
+          architectures: amd64
+          key_url: "http://${_param:local_repo_url}/public.gpg"
+          pin:
+          - pin: 'release s=mos8.0-security'
+            priority: 1000
+            package: '*'
+        mirantis_openstack_updates:
+          refresh_db: ${_param:linux_repo_refresh_db}
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/mos8/ mos8.0-updates main"
+          architectures: amd64
+          key_url: "http://${_param:local_repo_url}/public.gpg"
+          pin:
+          - pin: 'release s=mos8.0-updates'
+            priority: 1000
+            package: '*'
diff --git a/linux/system/repo-local/salt.yml b/linux/system/repo-local/salt.yml
new file mode 100644
index 0000000..273d850
--- /dev/null
+++ b/linux/system/repo-local/salt.yml
@@ -0,0 +1,9 @@
+parameters:
+  linux:
+    system:
+      repo:
+        salt:
+          refresh_db: ${_param:linux_repo_refresh_db}
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_distrib_codename}/ nightly salt"
+          architectures: amd64
+          key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo-local/salt_formulas.yml b/linux/system/repo-local/salt_formulas.yml
new file mode 100644
index 0000000..8f6706a
--- /dev/null
+++ b/linux/system/repo-local/salt_formulas.yml
@@ -0,0 +1,8 @@
+parameters:
+  linux:
+    system:
+      repo:
+        salt_formulas:
+          refresh_db: ${_param:linux_repo_refresh_db}
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_distrib_codename}/ nightly tcp-salt"
+          architectures: amd64
diff --git a/linux/system/repo-local/salt_xenial.yml b/linux/system/repo-local/salt_xenial.yml
new file mode 100644
index 0000000..273d850
--- /dev/null
+++ b/linux/system/repo-local/salt_xenial.yml
@@ -0,0 +1,9 @@
+parameters:
+  linux:
+    system:
+      repo:
+        salt:
+          refresh_db: ${_param:linux_repo_refresh_db}
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_distrib_codename}/ nightly salt"
+          architectures: amd64
+          key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo-local/sensu.yml b/linux/system/repo-local/sensu.yml
new file mode 100644
index 0000000..3e5b5a5
--- /dev/null
+++ b/linux/system/repo-local/sensu.yml
@@ -0,0 +1,9 @@
+parameters:
+  linux:
+    system:
+      repo:
+        sensu:
+          refresh_db: ${_param:linux_repo_refresh_db}
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_distrib_codename}/ nightly sensu"
+          architectures: amd64
+          key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo-local/tcpcloud.yml b/linux/system/repo-local/tcpcloud.yml
new file mode 100644
index 0000000..69ae25a
--- /dev/null
+++ b/linux/system/repo-local/tcpcloud.yml
@@ -0,0 +1,10 @@
+parameters:
+  linux:
+    system:
+      repo:
+        tcpcloud:
+          default: true
+          refresh_db: ${_param:linux_repo_refresh_db}
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_distrib_codename}/ nightly tcp tcp-liberty tcp-extra"
+          architectures: amd64
+          key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo-local/tcpcloud_main.yml b/linux/system/repo-local/tcpcloud_main.yml
new file mode 100644
index 0000000..4d326f9
--- /dev/null
+++ b/linux/system/repo-local/tcpcloud_main.yml
@@ -0,0 +1,10 @@
+parameters:
+  linux:
+    system:
+      repo:
+        tcpcloud_main:
+          default: false
+          refresh_db: ${_param:linux_repo_refresh_db}
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_distrib_codename}/ nightly tcp"
+          architectures: amd64
+          key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo-local/ubuntu/cloudarchive.yml b/linux/system/repo-local/ubuntu/cloudarchive.yml
new file mode 100644
index 0000000..b06c31a
--- /dev/null
+++ b/linux/system/repo-local/ubuntu/cloudarchive.yml
@@ -0,0 +1,10 @@
+parameters:
+  linux:
+    system:
+      repo:
+        cloudarchive:
+          refresh_db: ${_param:linux_repo_refresh_db}
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_distrib_codename}/ nightly liberty"
+          architectures: amd64
+          default: true
+          key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo-local/ubuntu/trusty.yml b/linux/system/repo-local/ubuntu/trusty.yml
new file mode 100644
index 0000000..b88e402
--- /dev/null
+++ b/linux/system/repo-local/ubuntu/trusty.yml
@@ -0,0 +1,10 @@
+parameters:
+  linux:
+    system:
+      repo:
+        ubuntu:
+          refresh_db: ${_param:linux_repo_refresh_db}
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/trusty/ nightly main"
+          architectures: amd64
+          default: true
+          key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo-local/ubuntu/xenial.yml b/linux/system/repo-local/ubuntu/xenial.yml
new file mode 100644
index 0000000..b4a1888
--- /dev/null
+++ b/linux/system/repo-local/ubuntu/xenial.yml
@@ -0,0 +1,10 @@
+parameters:
+  linux:
+    system:
+      repo:
+        ubuntu:
+          refresh_db: ${_param:linux_repo_refresh_db}
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/xenial/ nightly main"
+          architectures: amd64
+          default: true
+          key_url: "http://${_param:local_repo_url}/public.gpg"