diff --git a/aptly/server/mirror/ubuntu/trusty/tcpcloud.yml b/aptly/server/mirror/ubuntu/trusty/tcpcloud.yml
index 1e3d67a..c1196d7 100644
--- a/aptly/server/mirror/ubuntu/trusty/tcpcloud.yml
+++ b/aptly/server/mirror/ubuntu/trusty/tcpcloud.yml
@@ -13,7 +13,21 @@
           source: http://apt.tcpcloud.eu/nightly
           distribution: trusty
             #TODO: extra component might not be needed; tcp is just for heka
-          components: main security tcp
+          components: main security
+          architectures: amd64
+          key_url: "http://apt.tcpcloud.eu/public.gpg"
+          gpgkeys:
+            - 3EF02D1C
+          publisher:
+            component: tcp-main
+            distributions:
+              - ubuntu-trusty/nightly
+
+        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: tcp
           architectures: amd64
           key_url: "http://apt.tcpcloud.eu/public.gpg"
           gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/xenial/tcpcloud.yml b/aptly/server/mirror/ubuntu/xenial/tcpcloud.yml
new file mode 100644
index 0000000..740fa7b
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/tcpcloud.yml
@@ -0,0 +1,97 @@
+parameters:
+  aptly:
+    server:
+      mirror:
+
+        #TOOD: 4x the lower below
+        #tcpcloud-[stable/testing]-xxx-[xenial/xenial]:
+        #
+        # Other components
+        # salt tcp-salt extra liberty mitaka oc30 security mitaka
+
+        tcpcloud-nightly-main-xenial:
+          source: http://apt.tcpcloud.eu/nightly
+          distribution: xenial
+            #TODO: extra component might not be needed; tcp is just for heka
+          components: main security
+          architectures: amd64
+          key_url: "http://apt.tcpcloud.eu/public.gpg"
+          gpgkeys:
+            - 3EF02D1C
+          publisher:
+            component: tcp-main
+            distributions:
+              - ubuntu-xenial/nightly
+
+
+        tcpcloud-nightly-tcp-xenial:
+          source: http://apt.tcpcloud.eu/nightly
+          distribution: xenial
+            #TODO: extra component might not be needed; tcp is just for heka
+          components: tcp
+          architectures: amd64
+          key_url: "http://apt.tcpcloud.eu/public.gpg"
+          gpgkeys:
+            - 3EF02D1C
+          publisher:
+            component: tcp
+            distributions:
+              - ubuntu-xenial/nightly
+
+
+        tcpcloud-nightly-extra-xenial:
+          source: http://apt.tcpcloud.eu/nightly
+          distribution: xenial
+            #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:
+              - ubuntu-xenial/nightly
+
+        # required for salt formulas
+        tcpcloud-nightly-salt-xenial:
+          source: http://apt.tcpcloud.eu/nightly
+          distribution: xenial
+          components: tcp-salt
+          architectures: amd64
+          key_url: "http://apt.tcpcloud.eu/public.gpg"
+          gpgkeys:
+          - 3EF02D1C
+          publisher:
+            component: tcp-salt
+            distributions:
+              - ubuntu-xenial/nightly
+
+        # required for opencontrail formulas
+        tcpcloud-nightly-oc30-xenial:
+          source: http://apt.tcpcloud.eu/nightly
+          distribution: xenial
+          components: oc30
+          architectures: amd64
+          key_url: "http://apt.tcpcloud.eu/public.gpg"
+          gpgkeys:
+            - 3EF02D1C
+          publisher:
+            component: tcp-oc30
+            distributions:
+              - ubuntu-xenial/nightly
+
+        # elastic, kibana is there
+        tcpcloud-nightly-elastic-xenial:
+          source: http://apt.tcpcloud.eu/nightly
+          distribution: xenial
+          components: elastic
+          architectures: amd64
+          key_url: "http://apt.tcpcloud.eu/public.gpg"
+          gpgkeys:
+            - 3EF02D1C
+          publisher:
+            component: tcp-elastic
+            distributions:
+              - ubuntu-xenial/nightly
+