diff --git a/aptly/server/mirror/ubuntu/trusty/ceph.yml b/aptly/server/mirror/ubuntu/trusty/ceph.yml
index b2bae2d..2729acc 100644
--- a/aptly/server/mirror/ubuntu/trusty/ceph.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ceph.yml
@@ -12,4 +12,4 @@
           publisher:
             component: ceph
             distributions:
-              - trusty/nightly
+              - ubuntu-trusty/nightly
diff --git a/aptly/server/mirror/ubuntu/trusty/docker.yml b/aptly/server/mirror/ubuntu/trusty/docker.yml
index 91879dc..217d405 100644
--- a/aptly/server/mirror/ubuntu/trusty/docker.yml
+++ b/aptly/server/mirror/ubuntu/trusty/docker.yml
@@ -12,4 +12,4 @@
           publisher:
             component: docker
             distributions:
-              - trusty/nightly
+              - ubuntu-trusty/nightly
diff --git a/aptly/server/mirror/ubuntu/trusty/erlang.yml b/aptly/server/mirror/ubuntu/trusty/erlang.yml
index afbcb2e..7a01032 100644
--- a/aptly/server/mirror/ubuntu/trusty/erlang.yml
+++ b/aptly/server/mirror/ubuntu/trusty/erlang.yml
@@ -12,4 +12,4 @@
           publisher:
             component: erlang
             distributions:
-              - trusty/nightly
+              - ubuntu-trusty/nightly
diff --git a/aptly/server/mirror/ubuntu/trusty/foreman.yml b/aptly/server/mirror/ubuntu/trusty/foreman.yml
index 3a36a86..6769691 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:
-              - trusty/nightly
+              - ubuntu-trusty/nightly
         foreman-plugins-trusty:
           source: http://deb.theforeman.org
           distribution: plugins
@@ -23,4 +23,4 @@
           publisher:
             component: extra
             distributions:
-              - trusty/nightly
+              - ubuntu-trusty/nightly
diff --git a/aptly/server/mirror/ubuntu/trusty/galera.yml b/aptly/server/mirror/ubuntu/trusty/galera.yml
index 6d9786d..61acd31 100644
--- a/aptly/server/mirror/ubuntu/trusty/galera.yml
+++ b/aptly/server/mirror/ubuntu/trusty/galera.yml
@@ -12,4 +12,4 @@
           publisher:
             component: galera
             distributions:
-              - trusty-galera
+              - ubuntu-trusty/nightly
diff --git a/aptly/server/mirror/ubuntu/trusty/grafana.yml b/aptly/server/mirror/ubuntu/trusty/grafana.yml
index c743eb0..68ff86a 100644
--- a/aptly/server/mirror/ubuntu/trusty/grafana.yml
+++ b/aptly/server/mirror/ubuntu/trusty/grafana.yml
@@ -12,4 +12,4 @@
           publisher:
             component: grafana
             distributions:
-              - trusty/nightly
+              - ubuntu-trusty/nightly
diff --git a/aptly/server/mirror/ubuntu/trusty/haproxy.yml b/aptly/server/mirror/ubuntu/trusty/haproxy.yml
index 30f43c1..0b92cb2 100644
--- a/aptly/server/mirror/ubuntu/trusty/haproxy.yml
+++ b/aptly/server/mirror/ubuntu/trusty/haproxy.yml
@@ -12,4 +12,4 @@
           publisher:
             component: haproxy
             distributions:
-              - trusty-haproxy
+              - ubuntu-trusty/nightly
diff --git a/aptly/server/mirror/ubuntu/trusty/rabbitmq.yml b/aptly/server/mirror/ubuntu/trusty/rabbitmq.yml
index e5d8eca..0b40092 100644
--- a/aptly/server/mirror/ubuntu/trusty/rabbitmq.yml
+++ b/aptly/server/mirror/ubuntu/trusty/rabbitmq.yml
@@ -12,4 +12,4 @@
           publisher:
             component: rabbitmq
             distributions:
-              - trusty/nightly
+              - ubuntu-trusty/nightly
diff --git a/aptly/server/mirror/ubuntu/trusty/salt.yml b/aptly/server/mirror/ubuntu/trusty/salt.yml
index 76458bc..bfc4168 100644
--- a/aptly/server/mirror/ubuntu/trusty/salt.yml
+++ b/aptly/server/mirror/ubuntu/trusty/salt.yml
@@ -12,5 +12,5 @@
           publisher:
             component: salt
             distributions:
-              - trusty/nightly
+              - ubuntu-trusty/nightly
 
diff --git a/aptly/server/mirror/ubuntu/trusty/sssd.yml b/aptly/server/mirror/ubuntu/trusty/sssd.yml
index 7d60c8f..59436a0 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:
-              - trusty/nightly
+              - ubuntu-trusty/nightly
diff --git a/aptly/server/mirror/ubuntu/trusty/tcpcloud.yml b/aptly/server/mirror/ubuntu/trusty/tcpcloud.yml
index 3fea40b..1e3d67a 100644
--- a/aptly/server/mirror/ubuntu/trusty/tcpcloud.yml
+++ b/aptly/server/mirror/ubuntu/trusty/tcpcloud.yml
@@ -21,7 +21,7 @@
           publisher:
             component: tcp
             distributions:
-              - trusty/nightly
+              - ubuntu-trusty/nightly
 
         tcpcloud-nightly-extra-trusty:
           source: http://apt.tcpcloud.eu/nightly
@@ -35,7 +35,7 @@
           publisher:
             component: tcp-extra
             distributions:
-              - trusty/nightly
+              - ubuntu-trusty/nightly
 
         # required for alternative horizon plugins/etc..
         tcpcloud-nightly-liberty-trusty:
@@ -49,7 +49,7 @@
           publisher:
             component: tcp-liberty
             distributions:
-              - trusty/nightly
+              - ubuntu-trusty/nightly
 
         # required for salt formulas
         tcpcloud-nightly-salt-trusty:
@@ -63,7 +63,7 @@
           publisher:
             component: tcp-salt
             distributions:
-              - trusty/nightly
+              - ubuntu-trusty/nightly
 
         # required for opencontrail formulas
         tcpcloud-nightly-oc30-trusty:
@@ -77,7 +77,7 @@
           publisher:
             component: tcp-oc30
             distributions:
-              - trusty/nightly
+              - ubuntu-trusty/nightly
 
         # elastic, kibana is there
         tcpcloud-nightly-elastic-trusty:
@@ -91,5 +91,5 @@
           publisher:
             component: tcp-elastic
             distributions:
-              - trusty/nightly
+              - ubuntu-trusty/nightly
 
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntucloud.yml b/aptly/server/mirror/ubuntu/trusty/ubuntucloud.yml
index e940d37..b66d34c 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntucloud.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntucloud.yml
@@ -34,7 +34,7 @@
           publisher:
             component: liberty
             distributions:
-              - trusty/nightly
+              - ubuntu-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:
-              - trusty/nightly
+              - ubuntu-trusty/nightly
diff --git a/aptly/server/mirror/ubuntu/xenial/ceph.yml b/aptly/server/mirror/ubuntu/xenial/ceph.yml
index 7e9422e..efb1703 100644
--- a/aptly/server/mirror/ubuntu/xenial/ceph.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ceph.yml
@@ -12,4 +12,4 @@
           publisher:
             component: ceph
             distributions:
-              - xenial/nightly
+              - ubuntu-xenial/nightly
diff --git a/aptly/server/mirror/ubuntu/xenial/docker.yml b/aptly/server/mirror/ubuntu/xenial/docker.yml
index d420dfe..819de76 100644
--- a/aptly/server/mirror/ubuntu/xenial/docker.yml
+++ b/aptly/server/mirror/ubuntu/xenial/docker.yml
@@ -12,4 +12,4 @@
           publisher:
             component: docker
             distributions:
-              - xenial/nightly
+              - ubuntu-xenial/nightly
diff --git a/aptly/server/mirror/ubuntu/xenial/grafana.yml b/aptly/server/mirror/ubuntu/xenial/grafana.yml
index 58702d3..2db0586 100644
--- a/aptly/server/mirror/ubuntu/xenial/grafana.yml
+++ b/aptly/server/mirror/ubuntu/xenial/grafana.yml
@@ -12,4 +12,4 @@
           publisher:
             component: grafana
             distributions:
-              - xenial/nightly
+              - ubuntu-xenial/nightly
diff --git a/aptly/server/mirror/ubuntu/xenial/influxdb.yml b/aptly/server/mirror/ubuntu/xenial/influxdb.yml
index e70b60d..87930b9 100644
--- a/aptly/server/mirror/ubuntu/xenial/influxdb.yml
+++ b/aptly/server/mirror/ubuntu/xenial/influxdb.yml
@@ -12,4 +12,4 @@
           publisher:
             component: influxdb
             distributions:
-              - xenial/nightly
+              - ubuntu-xenial/nightly
diff --git a/aptly/server/mirror/ubuntu/xenial/salt.yml b/aptly/server/mirror/ubuntu/xenial/salt.yml
index 2fd1507..9a9b34c 100644
--- a/aptly/server/mirror/ubuntu/xenial/salt.yml
+++ b/aptly/server/mirror/ubuntu/xenial/salt.yml
@@ -12,4 +12,4 @@
           publisher:
             component: salt
             distributions:
-              - xenial/nightly
+              - ubuntu-xenial/nightly
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntucloud.yml b/aptly/server/mirror/ubuntu/xenial/ubuntucloud.yml
index 5a3f171..509c65a 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntucloud.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntucloud.yml
@@ -12,7 +12,7 @@
           publisher:
             component: newton
             distributions:
-              - xenial/nightly
+              - ubuntu-xenial/nightly
         xenial-updates-ocata:
           source: http://ubuntu-cloud.archive.canonical.com/ubuntu/
           distribution: xenial-updates/ocata
@@ -23,4 +23,4 @@
           publisher:
             component: ocata
             distributions:
-              - xenial/nightly
+              - ubuntu-xenial/nightly