diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu.yml
index 3d69387..22e83df 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu.yml
@@ -16,19 +16,19 @@
             component: main
             distributions:
               - ubuntu/trusty
-        #trusty-multiverse:
-        #  source: http://cz.archive.ubuntu.com/ubuntu/
-        #  distribution: trusty
-        #  components: multiverse
-        #  architectures: amd64
-        #  gpgkeys:
-        #    - 40976EAF437D05B5
-        #    - 437D05B5
-        #    - C0B21F32
-        #  publisher:
-        #    component: multiverse
-        #    distributions:
-        #      - ubuntu/trusty
+        trusty-multiverse:
+          source: http://cz.archive.ubuntu.com/ubuntu/
+          distribution: trusty
+          components: multiverse
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: multiverse
+            distributions:
+              - ubuntu/trusty
         trusty-restricted:
           source: http://cz.archive.ubuntu.com/ubuntu/
           distribution: trusty
@@ -70,19 +70,19 @@
             component: main
             distributions:
               - ubuntu/trusty-updates
-        #trusty-updates-multiverse:
-        #  source: http://cz.archive.ubuntu.com/ubuntu/
-        #  distribution: trusty-updates
-        #  components: multiverse
-        #  architectures: amd64
-        #  gpgkeys:
-        #    - 40976EAF437D05B5
-        #    - 437D05B5
-        #    - C0B21F32
-        #  publisher:
-        #    component: multiverse
-        #    distributions:
-        #      - ubuntu/trusty-updates
+        trusty-updates-multiverse:
+          source: http://cz.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://cz.archive.ubuntu.com/ubuntu/
           distribution: trusty-updates
@@ -124,19 +124,19 @@
             component: main
             distributions:
               - ubuntu/trusty-security
-        #trusty-security-multiverse:
-        #  source: http://cz.archive.ubuntu.com/ubuntu/
-        #  distribution: trusty-security
-        #  components: multiverse
-        #  architectures: amd64
-        #  gpgkeys:
-        #    - 40976EAF437D05B5
-        #    - 437D05B5
-        #    - C0B21F32
-        #  publisher:
-        #    component: multiverse
-        #    distributions:
-        #      - ubuntu/trusty-security
+        trusty-security-multiverse:
+          source: http://cz.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://cz.archive.ubuntu.com/ubuntu/
           distribution: trusty-security
@@ -178,19 +178,19 @@
             component: main
             distributions:
               - ubuntu/trusty-proposed
-        #trusty-proposed-multiverse:
-        #  source: http://cz.archive.ubuntu.com/ubuntu/
-        #  distribution: trusty-proposed
-        #  components: multiverse
-        #  architectures: amd64
-        #  gpgkeys:
-        #    - 40976EAF437D05B5
-        #    - 437D05B5
-        #    - C0B21F32
-        #  publisher:
-        #    component: multiverse
-        #    distributions:
-        #      - ubuntu/trusty-proposed
+        trusty-proposed-multiverse:
+          source: http://cz.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://cz.archive.ubuntu.com/ubuntu/
           distribution: trusty-proposed
@@ -232,19 +232,19 @@
             component: main
             distributions:
               - ubuntu/trusty-backports
-        #trusty-backports-multiverse:
-        #  source: http://cz.archive.ubuntu.com/ubuntu/
-        #  distribution: trusty-backports
-        #  components: multiverse
-        #  architectures: amd64
-        #  gpgkeys:
-        #    - 40976EAF437D05B5
-        #    - 437D05B5
-        #    - C0B21F32
-        #  publisher:
-        #    component: multiverse
-        #    distributions:
-        #      - ubuntu/trusty-backports
+        trusty-backports-multiverse:
+          source: http://cz.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://cz.archive.ubuntu.com/ubuntu/
           distribution: trusty-backports
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu.yml
index d684263..10c54a5 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu.yml
@@ -16,19 +16,19 @@
             component: main
             distributions:
               - ubuntu/xenial
-        #xenial-multiverse:
-        #  source: http://cz.archive.ubuntu.com/ubuntu/
-        #  distribution: xenial
-        #  components: multiverse
-        #  architectures: amd64
-        #  gpgkeys:
-        #    - 40976EAF437D05B5
-        #    - 437D05B5
-        #    - C0B21F32
-        #  publisher:
-        #    component: multiverse
-        #    distributions:
-        #      - ubuntu/xenial
+        xenial-multiverse:
+          source: http://cz.archive.ubuntu.com/ubuntu/
+          distribution: xenial
+          components: multiverse
+          architectures: amd64
+          gpgkeys:
+            - 40976EAF437D05B5
+            - 437D05B5
+            - C0B21F32
+          publisher:
+            component: multiverse
+            distributions:
+              - ubuntu/xenial
         xenial-restricted:
           source: http://cz.archive.ubuntu.com/ubuntu/
           distribution: xenial
@@ -70,19 +70,19 @@
             component: main
             distributions:
               - ubuntu/xenial-updates
-        #xenial-updates-multiverse:
-        #  source: http://cz.archive.ubuntu.com/ubuntu/
-        #  distribution: xenial-updates
-        #  components: multiverse
-        #  architectures: amd64
-        #  gpgkeys:
-        #    - 40976EAF437D05B5
-        #    - 437D05B5
-        #    - C0B21F32
-        #  publisher:
-        #    component: multiverse
-        #    distributions:
-        #      - ubuntu/xenial-updates
+        xenial-updates-multiverse:
+          source: http://cz.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://cz.archive.ubuntu.com/ubuntu/
           distribution: xenial-updates
@@ -124,19 +124,19 @@
             component: main
             distributions:
               - ubuntu/xenial-security
-        #xenial-security-multiverse:
-        #  source: http://cz.archive.ubuntu.com/ubuntu/
-        #  distribution: xenial-security
-        #  components: multiverse
-        #  architectures: amd64
-        #  gpgkeys:
-        #    - 40976EAF437D05B5
-        #    - 437D05B5
-        #    - C0B21F32
-        #  publisher:
-        #    component: multiverse
-        #    distributions:
-        #      - ubuntu/xenial-security
+        xenial-security-multiverse:
+          source: http://cz.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://cz.archive.ubuntu.com/ubuntu/
           distribution: xenial-security
@@ -178,19 +178,19 @@
             component: main
             distributions:
               - ubuntu/xenial-proposed
-        #xenial-proposed-multiverse:
-        #  source: http://cz.archive.ubuntu.com/ubuntu/
-        #  distribution: xenial-proposed
-        #  components: multiverse
-        #  architectures: amd64
-        #  gpgkeys:
-        #    - 40976EAF437D05B5
-        #    - 437D05B5
-        #    - C0B21F32
-        #  publisher:
-        #    component: multiverse
-        #    distributions:
-        #      - ubuntu/xenial-proposed
+        xenial-proposed-multiverse:
+          source: http://cz.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://cz.archive.ubuntu.com/ubuntu/
           distribution: xenial-proposed
@@ -232,19 +232,19 @@
             component: main
             distributions:
               - ubuntu/xenial-backports
-        #xenial-backports-multiverse:
-        #  source: http://cz.archive.ubuntu.com/ubuntu/
-        #  distribution: xenial-backports
-        #  components: multiverse
-        #  architectures: amd64
-        #  gpgkeys:
-        #    - 40976EAF437D05B5
-        #    - 437D05B5
-        #    - C0B21F32
-        #  publisher:
-        #    component: multiverse
-        #    distributions:
-        #      - ubuntu/xenial-backports
+        xenial-backports-multiverse:
+          source: http://cz.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://cz.archive.ubuntu.com/ubuntu/
           distribution: xenial-backports