diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu.yml
index 710b0cb..486e341 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu.yml
@@ -2,6 +2,7 @@
   aptly:
     server:
       mirror:
+        # trusty
         trusty-main:
           source: http://in.archive.ubuntu.com/ubuntu/
           distribution: trusty
@@ -14,7 +15,33 @@
           publisher:
             component: main
             distributions:
-              - trusty/nightly
+              - ubuntu/trusty
+        #trusty-multiverse:
+        #  source: http://in.archive.ubuntu.com/ubuntu/
+        #  distribution: trusty
+        #  components: multiverse
+        #  architectures: amd64
+        #  gpgkeys:
+        #    - 40976EAF437D05B5
+        #    - 437D05B5
+        #    - C0B21F32
+        #  publisher:
+        #    component: multiverse
+        #    distributions:
+        #      - ubuntu/trusty
+        trusty-restricted:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: trusty
+          components: restricted
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: restricted
+            distributions:
+              - ubuntu/trusty
         trusty-universe:
           source: http://in.archive.ubuntu.com/ubuntu/
           distribution: trusty
@@ -25,10 +52,12 @@
             - 437D05B5
             - C0B21F32
           publisher:
-            component: main
+            component: universe
             distributions:
-              - trusty/nightly
-        trusty-updates:
+              - ubuntu/trusty
+
+        # trusty-updates
+        trusty-updates-main:
           source: http://in.archive.ubuntu.com/ubuntu/
           distribution: trusty-updates
           components: main
@@ -40,7 +69,33 @@
           publisher:
             component: main
             distributions:
-              - trusty/nightly
+              - ubuntu/trusty-updates
+        #trusty-updates-multiverse:
+        #  source: http://in.archive.ubuntu.com/ubuntu/
+        #  distribution: trusty-updates
+        #  components: multiverse
+        #  architectures: amd64
+        #  gpgkeys:
+        #    - 40976EAF437D05B5
+        #    - 437D05B5
+        #    - C0B21F32
+        #  publisher:
+        #    component: multiverse
+        #    distributions:
+        #      - ubuntu/trusty-updates
+        trusty-updates-restricted:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: trusty-updates
+          components: restricted
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: restricted
+            distributions:
+              - ubuntu/trusty-updates
         trusty-updates-universe:
           source: http://in.archive.ubuntu.com/ubuntu/
           distribution: trusty-updates
@@ -51,10 +106,12 @@
             - 437D05B5
             - C0B21F32
           publisher:
-            component: main
+            component: universe
             distributions:
-              - trusty/nightly
-        trusty-security:
+              - ubuntu/trusty-updates
+
+        #trusty-security:
+        trusty-security-main:
           source: http://in.archive.ubuntu.com/ubuntu/
           distribution: trusty-security
           components: main
@@ -64,6 +121,154 @@
             - 437D05B5
             - C0B21F32
           publisher:
-            component: security
+            component: main
             distributions:
-              - trusty/nightly
+              - ubuntu/trusty-security
+        #trusty-security-multiverse:
+        #  source: http://in.archive.ubuntu.com/ubuntu/
+        #  distribution: trusty-security
+        #  components: multiverse
+        #  architectures: amd64
+        #  gpgkeys:
+        #    - 40976EAF437D05B5
+        #    - 437D05B5
+        #    - C0B21F32
+        #  publisher:
+        #    component: multiverse
+        #    distributions:
+        #      - ubuntu/trusty-security
+        trusty-security-restricted:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: trusty-security
+          components: restricted
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: restricted
+            distributions:
+              - ubuntu/trusty-security
+        trusty-security-universe:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: trusty-security
+          components: universe
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: universe
+            distributions:
+              - ubuntu/trusty-security
+
+        #trusty-proposed:
+        trusty-proposed-main:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: trusty-proposed
+          components: main
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: main
+            distributions:
+              - ubuntu/trusty-proposed
+        #trusty-proposed-multiverse:
+        #  source: http://in.archive.ubuntu.com/ubuntu/
+        #  distribution: trusty-proposed
+        #  components: multiverse
+        #  architectures: amd64
+        #  gpgkeys:
+        #    - 40976EAF437D05B5
+        #    - 437D05B5
+        #    - C0B21F32
+        #  publisher:
+        #    component: multiverse
+        #    distributions:
+        #      - ubuntu/trusty-proposed
+        trusty-proposed-restricted:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: trusty-proposed
+          components: restricted
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: restricted
+            distributions:
+              - ubuntu/trusty-proposed
+        trusty-proposed-universe:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: trusty-proposed
+          components: universe
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: universe
+            distributions:
+              - ubuntu/trusty-proposed
+
+        #trusty-backports:
+        trusty-backports-main:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: trusty-backports
+          components: main
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: main
+            distributions:
+              - ubuntu/trusty-backports
+        #trusty-backports-multiverse:
+        #  source: http://in.archive.ubuntu.com/ubuntu/
+        #  distribution: trusty-backports
+        #  components: multiverse
+        #  architectures: amd64
+        #  gpgkeys:
+        #    - 40976EAF437D05B5
+        #    - 437D05B5
+        #    - C0B21F32
+        #  publisher:
+        #    component: multiverse
+        #    distributions:
+        #      - ubuntu/trusty-backports
+        trusty-backports-restricted:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: trusty-backports
+          components: restricted
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: restricted
+            distributions:
+              - ubuntu/trusty-backports
+        trusty-backports-universe:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: trusty-backports
+          components: universe
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: universe
+            distributions:
+              - ubuntu/trusty-backports
+
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu.yml
index e5edb0e..871f133 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu.yml
@@ -2,6 +2,7 @@
   aptly:
     server:
       mirror:
+        # xenial
         xenial-main:
           source: http://in.archive.ubuntu.com/ubuntu/
           distribution: xenial
@@ -14,7 +15,33 @@
           publisher:
             component: main
             distributions:
-              - xenial/nightly
+              - ubuntu/xenial
+        #xenial-multiverse:
+        #  source: http://in.archive.ubuntu.com/ubuntu/
+        #  distribution: xenial
+        #  components: multiverse
+        #  architectures: amd64
+        #  gpgkeys:
+        #    - 40976EAF437D05B5
+        #    - 437D05B5
+        #    - C0B21F32
+        #  publisher:
+        #    component: multiverse
+        #    distributions:
+        #      - ubuntu/xenial
+        xenial-restricted:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: xenial
+          components: restricted
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: restricted
+            distributions:
+              - ubuntu/xenial
         xenial-universe:
           source: http://in.archive.ubuntu.com/ubuntu/
           distribution: xenial
@@ -25,10 +52,12 @@
             - 437D05B5
             - C0B21F32
           publisher:
-            component: main
+            component: universe
             distributions:
-              - xenial/nightly
-        xenial-updates:
+              - ubuntu/xenial
+
+        # xenial-updates
+        xenial-updates-main:
           source: http://in.archive.ubuntu.com/ubuntu/
           distribution: xenial-updates
           components: main
@@ -40,7 +69,33 @@
           publisher:
             component: main
             distributions:
-              - xenial/nightly
+              - ubuntu/xenial-updates
+        #xenial-updates-multiverse:
+        #  source: http://in.archive.ubuntu.com/ubuntu/
+        #  distribution: xenial-updates
+        #  components: multiverse
+        #  architectures: amd64
+        #  gpgkeys:
+        #    - 40976EAF437D05B5
+        #    - 437D05B5
+        #    - C0B21F32
+        #  publisher:
+        #    component: multiverse
+        #    distributions:
+        #      - ubuntu/xenial-updates
+        xenial-updates-restricted:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: xenial-updates
+          components: restricted
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: restricted
+            distributions:
+              - ubuntu/xenial-updates
         xenial-updates-universe:
           source: http://in.archive.ubuntu.com/ubuntu/
           distribution: xenial-updates
@@ -51,10 +106,12 @@
             - 437D05B5
             - C0B21F32
           publisher:
-            component: main
+            component: universe
             distributions:
-              - xenial/nightly
-        xenial-security:
+              - ubuntu/xenial-updates
+
+        #xenial-security:
+        xenial-security-main:
           source: http://in.archive.ubuntu.com/ubuntu/
           distribution: xenial-security
           components: main
@@ -64,6 +121,153 @@
             - 437D05B5
             - C0B21F32
           publisher:
-            component: security
+            component: main
             distributions:
-              - xenial/nightly
+              - ubuntu/xenial-security
+        #xenial-security-multiverse:
+        #  source: http://in.archive.ubuntu.com/ubuntu/
+        #  distribution: xenial-security
+        #  components: multiverse
+        #  architectures: amd64
+        #  gpgkeys:
+        #    - 40976EAF437D05B5
+        #    - 437D05B5
+        #    - C0B21F32
+        #  publisher:
+        #    component: multiverse
+        #    distributions:
+        #      - ubuntu/xenial-security
+        xenial-security-restricted:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: xenial-security
+          components: restricted
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: restricted
+            distributions:
+              - ubuntu/xenial-security
+        xenial-security-universe:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: xenial-security
+          components: universe
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: universe
+            distributions:
+              - ubuntu/xenial-security
+
+        #xenial-proposed:
+        xenial-proposed-main:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: xenial-proposed
+          components: main
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: main
+            distributions:
+              - ubuntu/xenial-proposed
+        #xenial-proposed-multiverse:
+        #  source: http://in.archive.ubuntu.com/ubuntu/
+        #  distribution: xenial-proposed
+        #  components: multiverse
+        #  architectures: amd64
+        #  gpgkeys:
+        #    - 40976EAF437D05B5
+        #    - 437D05B5
+        #    - C0B21F32
+        #  publisher:
+        #    component: multiverse
+        #    distributions:
+        #      - ubuntu/xenial-proposed
+        xenial-proposed-restricted:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: xenial-proposed
+          components: restricted
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: restricted
+            distributions:
+              - ubuntu/xenial-proposed
+        xenial-proposed-universe:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: xenial-proposed
+          components: universe
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: universe
+            distributions:
+              - ubuntu/xenial-proposed
+
+        #xenial-backports:
+        xenial-backports-main:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: xenial-backports
+          components: main
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: main
+            distributions:
+              - ubuntu/xenial-backports
+        #xenial-backports-multiverse:
+        #  source: http://in.archive.ubuntu.com/ubuntu/
+        #  distribution: xenial-backports
+        #  components: multiverse
+        #  architectures: amd64
+        #  gpgkeys:
+        #    - 40976EAF437D05B5
+        #    - 437D05B5
+        #    - C0B21F32
+        #  publisher:
+        #    component: multiverse
+        #    distributions:
+        #      - ubuntu/xenial-backports
+        xenial-backports-restricted:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: xenial-backports
+          components: restricted
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: restricted
+            distributions:
+              - ubuntu/xenial-backports
+        xenial-backports-universe:
+          source: http://in.archive.ubuntu.com/ubuntu/
+          distribution: xenial-backports
+          components: universe
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: universe
+            distributions:
+              - ubuntu/xenial-backports