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 67ebfda..b2bae2d 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:
-              - nightly/trusty
+              - trusty/nightly
diff --git a/aptly/server/mirror/ubuntu/trusty/docker.yml b/aptly/server/mirror/ubuntu/trusty/docker.yml
index 0b2cba7..91879dc 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:
-              - nightly/trusty
+              - trusty/nightly
diff --git a/aptly/server/mirror/ubuntu/trusty/erlang.yml b/aptly/server/mirror/ubuntu/trusty/erlang.yml
index 1f0bf57..afbcb2e 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:
-              - 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/grafana.yml b/aptly/server/mirror/ubuntu/trusty/grafana.yml
index 9a269fd..c743eb0 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:
-              - nightly/trusty
+              - trusty/nightly
diff --git a/aptly/server/mirror/ubuntu/trusty/haproxy.yml b/aptly/server/mirror/ubuntu/trusty/haproxy.yml
index 14ab72d..30f43c1 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:
-              - nightly/trusty
+              - trusty-haproxy
diff --git a/aptly/server/mirror/ubuntu/trusty/mos8.yml b/aptly/server/mirror/ubuntu/trusty/mos8.yml
index 285d292..bf9faaf 100644
--- a/aptly/server/mirror/ubuntu/trusty/mos8.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mos8.yml
@@ -12,19 +12,7 @@
           publisher:
             component: main
             distributions:
-              - 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:
-              - nightly/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
@@ -36,7 +24,7 @@
           publisher:
             component: main
             distributions:
-              - nightly/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
@@ -48,7 +36,7 @@
           publisher:
             component: main
             distributions:
-              - nightly/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
@@ -60,7 +48,7 @@
           publisher:
             component: main
             distributions:
-              - nightly/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
@@ -72,4 +60,4 @@
           publisher:
             component: main
             distributions:
-              - nightly/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 9ab87e1..8722650 100644
--- a/aptly/server/mirror/ubuntu/trusty/mos9.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mos9.yml
@@ -12,19 +12,7 @@
           publisher:
             component: main
             distributions:
-              - 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:
-              - nightly/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
@@ -36,7 +24,7 @@
           publisher:
             component: main
             distributions:
-              - nightly/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
@@ -48,7 +36,7 @@
           publisher:
             component: main
             distributions:
-              - nightly/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
@@ -60,7 +48,7 @@
           publisher:
             component: main
             distributions:
-              - nightly/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
@@ -72,4 +60,4 @@
           publisher:
             component: main
             distributions:
-              - nightly/mos9.0-updates
+              - mos9/mos9.0-updates
diff --git a/aptly/server/mirror/ubuntu/trusty/rabbitmq.yml b/aptly/server/mirror/ubuntu/trusty/rabbitmq.yml
index 5347ef3..e5d8eca 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:
-              - nightly/trusty
+              - trusty/nightly
diff --git a/aptly/server/mirror/ubuntu/trusty/salt.yml b/aptly/server/mirror/ubuntu/trusty/salt.yml
index f009167..76458bc 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:
-              - 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
index 455c791..a04e8c5 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:
-              - nightly/trusty
+              - trusty/nightly
 
         tcpcloud-nightly-extra-trusty:
           source: http://apt.tcpcloud.eu/nightly
@@ -35,7 +35,7 @@
           publisher:
             component: tcp-extra
             distributions:
-              - nightly/trusty
+              - trusty/nightly
 
         # required for alternative horizon plugins/etc..
         tcpcloud-nightly-liberty-trusty:
@@ -49,7 +49,7 @@
           publisher:
             component: tcp-liberty
             distributions:
-              - nightly/trusty
+              - trusty/nightly
 
         # required for salt formulas
         tcpcloud-nightly-salt-trusty:
@@ -63,7 +63,7 @@
           publisher:
             component: tcp-salt
             distributions:
-              - nightly/trusty
+              - trusty/nightly
 
         # required for opencontrail formulas
         tcpcloud-nightly-oc30-trusty:
@@ -77,5 +77,5 @@
           publisher:
             component: tcp-oc30
             distributions:
-              - nightly/trusty
+              - trusty/nightly
 
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu.yml
index d4e9ba5..710b0cb 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu.yml
@@ -3,7 +3,7 @@
     server:
       mirror:
         trusty-main:
-          source: http://cz.archive.ubuntu.com/ubuntu/
+          source: http://in.archive.ubuntu.com/ubuntu/
           distribution: trusty
           components: main
           architectures: amd64
@@ -14,9 +14,9 @@
           publisher:
             component: main
             distributions:
-              - nightly/trusty
+              - trusty/nightly
         trusty-universe:
-          source: http://cz.archive.ubuntu.com/ubuntu/
+          source: http://in.archive.ubuntu.com/ubuntu/
           distribution: trusty
           components: universe
           architectures: amd64
@@ -27,9 +27,9 @@
           publisher:
             component: main
             distributions:
-              - nightly/trusty
+              - trusty/nightly
         trusty-updates:
-          source: http://cz.archive.ubuntu.com/ubuntu/
+          source: http://in.archive.ubuntu.com/ubuntu/
           distribution: trusty-updates
           components: main
           architectures: amd64
@@ -40,9 +40,9 @@
           publisher:
             component: main
             distributions:
-              - nightly/trusty
+              - trusty/nightly
         trusty-updates-universe:
-          source: http://cz.archive.ubuntu.com/ubuntu/
+          source: http://in.archive.ubuntu.com/ubuntu/
           distribution: trusty-updates
           components: universe
           architectures: amd64
@@ -53,9 +53,9 @@
           publisher:
             component: main
             distributions:
-              - nightly/trusty
+              - trusty/nightly
         trusty-security:
-          source: http://cz.archive.ubuntu.com/ubuntu/
+          source: http://in.archive.ubuntu.com/ubuntu/
           distribution: trusty-security
           components: main
           architectures: amd64
@@ -66,4 +66,4 @@
           publisher:
             component: security
             distributions:
-              - nightly/trusty
+              - trusty/nightly
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntucloud.yml b/aptly/server/mirror/ubuntu/trusty/ubuntucloud.yml
index 84333ce..e940d37 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:
-              - 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 fdf76ee..7e9422e 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:
-              - nightly/xenial
+              - xenial/nightly
diff --git a/aptly/server/mirror/ubuntu/xenial/docker.yml b/aptly/server/mirror/ubuntu/xenial/docker.yml
index cfaaa32..d420dfe 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:
-              - nightly/xenial
+              - xenial/nightly
diff --git a/aptly/server/mirror/ubuntu/xenial/grafana.yml b/aptly/server/mirror/ubuntu/xenial/grafana.yml
index 21a55e1..58702d3 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:
-              - nightly/xenial
+              - xenial/nightly
diff --git a/aptly/server/mirror/ubuntu/xenial/salt.yml b/aptly/server/mirror/ubuntu/xenial/salt.yml
index f362f32..2fd1507 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:
-              - nightly/xenial
+              - xenial/nightly
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu.yml
index b202450..e5edb0e 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu.yml
@@ -3,7 +3,7 @@
     server:
       mirror:
         xenial-main:
-          source: http://cz.archive.ubuntu.com/ubuntu/
+          source: http://in.archive.ubuntu.com/ubuntu/
           distribution: xenial
           components: main
           architectures: amd64
@@ -14,9 +14,9 @@
           publisher:
             component: main
             distributions:
-              - nightly/xenial
+              - xenial/nightly
         xenial-universe:
-          source: http://cz.archive.ubuntu.com/ubuntu/
+          source: http://in.archive.ubuntu.com/ubuntu/
           distribution: xenial
           components: universe
           architectures: amd64
@@ -27,9 +27,9 @@
           publisher:
             component: main
             distributions:
-              - nightly/xenial
+              - xenial/nightly
         xenial-updates:
-          source: http://cz.archive.ubuntu.com/ubuntu/
+          source: http://in.archive.ubuntu.com/ubuntu/
           distribution: xenial-updates
           components: main
           architectures: amd64
@@ -40,9 +40,9 @@
           publisher:
             component: main
             distributions:
-              - nightly/xenial
+              - xenial/nightly
         xenial-updates-universe:
-          source: http://cz.archive.ubuntu.com/ubuntu/
+          source: http://in.archive.ubuntu.com/ubuntu/
           distribution: xenial-updates
           components: universe
           architectures: amd64
@@ -53,9 +53,9 @@
           publisher:
             component: main
             distributions:
-              - nightly/xenial
+              - xenial/nightly
         xenial-security:
-          source: http://cz.archive.ubuntu.com/ubuntu/
+          source: http://in.archive.ubuntu.com/ubuntu/
           distribution: xenial-security
           components: main
           architectures: amd64
@@ -66,4 +66,4 @@
           publisher:
             component: security
             distributions:
-              - nightly/xenial
+              - xenial/nightly
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntucloud.yml b/aptly/server/mirror/ubuntu/xenial/ubuntucloud.yml
index cbf9af8..5a3f171 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:
-              - nightly/xenial
+              - 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:
-              - nightly/xenial
+              - xenial/nightly