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