aptly, local repos suitable for deployment
diff --git a/aptly/server/mirror/ubuntu/xenial/ceph.yml b/aptly/server/mirror/ubuntu/xenial/ceph.yml
index 53d2ae8..fdf76ee 100644
--- a/aptly/server/mirror/ubuntu/xenial/ceph.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ceph.yml
@@ -10,6 +10,6 @@
           gpgkeys:
             - 460F3994
           publisher:
-            component: extra
+            component: ceph
             distributions:
               - nightly/xenial
diff --git a/aptly/server/mirror/ubuntu/xenial/docker.yml b/aptly/server/mirror/ubuntu/xenial/docker.yml
index 64bf728..cfaaa32 100644
--- a/aptly/server/mirror/ubuntu/xenial/docker.yml
+++ b/aptly/server/mirror/ubuntu/xenial/docker.yml
@@ -10,6 +10,6 @@
           gpgkeys:
             - 58118E89F3A912897C070ADBF76221572C52609D
           publisher:
-            component: extra
+            component: docker
             distributions:
               - nightly/xenial
diff --git a/aptly/server/mirror/ubuntu/xenial/grafana.yml b/aptly/server/mirror/ubuntu/xenial/grafana.yml
index ffee38c..21a55e1 100644
--- a/aptly/server/mirror/ubuntu/xenial/grafana.yml
+++ b/aptly/server/mirror/ubuntu/xenial/grafana.yml
@@ -10,6 +10,6 @@
           gpgkeys:
             - D59097AB
           publisher:
-            component: extra
+            component: grafana
             distributions:
               - nightly/xenial
diff --git a/aptly/server/mirror/ubuntu/xenial/salt.yml b/aptly/server/mirror/ubuntu/xenial/salt.yml
index e41459f..f362f32 100644
--- a/aptly/server/mirror/ubuntu/xenial/salt.yml
+++ b/aptly/server/mirror/ubuntu/xenial/salt.yml
@@ -10,6 +10,6 @@
           gpgkeys:
             - DE57BFBE
           publisher:
-            component: extra
+            component: salt
             distributions:
               - nightly/xenial
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntucloud.yml b/aptly/server/mirror/ubuntu/xenial/ubuntucloud.yml
new file mode 100644
index 0000000..cbf9af8
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntucloud.yml
@@ -0,0 +1,26 @@
+parameters:
+  aptly:
+    server:
+      mirror:
+        xenial-updates-newton:
+          source: http://ubuntu-cloud.archive.canonical.com/ubuntu/
+          distribution: xenial-updates/newton
+          components: main
+          architectures: amd64
+          gpgkeys:
+            - EC4926EA
+          publisher:
+            component: newton
+            distributions:
+              - nightly/xenial
+        xenial-updates-ocata:
+          source: http://ubuntu-cloud.archive.canonical.com/ubuntu/
+          distribution: xenial-updates/ocata
+          components: main
+          architectures: amd64
+          gpgkeys:
+            - EC4926EA
+          publisher:
+            component: ocata
+            distributions:
+              - nightly/xenial