diff --git a/aptly/server/mirror/ubuntu/trusty/ceph.yml b/aptly/server/mirror/ubuntu/trusty/ceph.yml
index 0b4d7c3..67ebfda 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
diff --git a/aptly/server/mirror/ubuntu/trusty/docker.yml b/aptly/server/mirror/ubuntu/trusty/docker.yml
index 5fc2a76..0b2cba7 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
diff --git a/aptly/server/mirror/ubuntu/trusty/erlang.yml b/aptly/server/mirror/ubuntu/trusty/erlang.yml
index aba5e03..1f0bf57 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
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..9a269fd 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
diff --git a/aptly/server/mirror/ubuntu/trusty/haproxy.yml b/aptly/server/mirror/ubuntu/trusty/haproxy.yml
index e69fa20..14ab72d 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
diff --git a/aptly/server/mirror/ubuntu/trusty/mos8.yml b/aptly/server/mirror/ubuntu/trusty/mos8.yml
index 7c9fe1a..285d292 100644
--- a/aptly/server/mirror/ubuntu/trusty/mos8.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mos8.yml
@@ -8,58 +8,68 @@
           components: main restricted
           architectures: amd64
           gpgkeys:
-            - EC4926EA
+            - 1FA22B08
           publisher:
             component: main
             distributions:
-              - mos8.0
+              - nightly/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"
+          gpgkeys:
+            - 1FA22B08
           publisher:
             component: main
             distributions:
-              - mos8.0
+              - nightly/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
+              - nightly/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
+              - nightly/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
+              - nightly/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
+              - nightly/mos8.0-updates
diff --git a/aptly/server/mirror/ubuntu/trusty/mos9.yml b/aptly/server/mirror/ubuntu/trusty/mos9.yml
index e9aeddb..9ab87e1 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
+              - nightly/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"
+          gpgkeys:
+            - 1FA22B08
           publisher:
             component: main
             distributions:
-              - mos9.0
+              - nightly/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
+              - nightly/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
+              - nightly/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
+              - nightly/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
+              - nightly/mos9.0-updates
diff --git a/aptly/server/mirror/ubuntu/trusty/rabbitmq.yml b/aptly/server/mirror/ubuntu/trusty/rabbitmq.yml
index 17b0f07..5347ef3 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
diff --git a/aptly/server/mirror/ubuntu/trusty/salt.yml b/aptly/server/mirror/ubuntu/trusty/salt.yml
index 8c46007..f009167 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
+
diff --git a/aptly/server/mirror/ubuntu/trusty/tcpcloud.yml b/aptly/server/mirror/ubuntu/trusty/tcpcloud.yml
new file mode 100644
index 0000000..455c791
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/tcpcloud.yml
@@ -0,0 +1,81 @@
+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:
+              - nightly/trusty
+
+        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:
+              - nightly/trusty
+
+        # 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:
+              - nightly/trusty
+
+        # 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:
+              - nightly/trusty
+
+        # 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:
+              - nightly/trusty
+
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntucloud.yml b/aptly/server/mirror/ubuntu/trusty/ubuntucloud.yml
index 2fefde0..84333ce 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
diff --git a/aptly/server/mirror/ubuntu/xenial/ceph.yml b/aptly/server/mirror/ubuntu/xenial/ceph.yml
index 53d2ae8..fdf76ee 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
diff --git a/aptly/server/mirror/ubuntu/xenial/docker.yml b/aptly/server/mirror/ubuntu/xenial/docker.yml
index 64bf728..cfaaa32 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
diff --git a/aptly/server/mirror/ubuntu/xenial/grafana.yml b/aptly/server/mirror/ubuntu/xenial/grafana.yml
index ffee38c..21a55e1 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
diff --git a/aptly/server/mirror/ubuntu/xenial/salt.yml b/aptly/server/mirror/ubuntu/xenial/salt.yml
index e41459f..f362f32 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
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntucloud.yml b/aptly/server/mirror/ubuntu/xenial/ubuntucloud.yml
new file mode 100644
index 0000000..cbf9af8
--- /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:
+              - nightly/xenial
+        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:
+              - nightly/xenial