diff --git a/aptly/server/mirror/ubuntu/trusty/docker.yml b/aptly/server/mirror/ubuntu/trusty/docker.yml
index db97d14..217d405 100644
--- a/aptly/server/mirror/ubuntu/trusty/docker.yml
+++ b/aptly/server/mirror/ubuntu/trusty/docker.yml
@@ -3,12 +3,12 @@
     server:
       mirror:
         docker-trusty:
-          source: 'https://download.docker.com/linux/ubuntu'
-          distribution: trusty
-          components: stable
+          source: https://apt.dockerproject.org/repo
+          distribution: ubuntu-trusty
+          components: main
           architectures: amd64
           gpgkeys:
-            - 9DC858229FC7DD38854AE2D88D81803C0EBFCD88
+            - 58118E89F3A912897C070ADBF76221572C52609D
           publisher:
             component: docker
             distributions:
diff --git a/aptly/server/mirror/ubuntu/xenial/docker.yml b/aptly/server/mirror/ubuntu/xenial/docker.yml
index b5d98c5..4334374 100644
--- a/aptly/server/mirror/ubuntu/xenial/docker.yml
+++ b/aptly/server/mirror/ubuntu/xenial/docker.yml
@@ -1,14 +1,16 @@
 parameters:
+  _param:
+    apt_mk_version: stable
   aptly:
     server:
       mirror:
         docker-xenial:
-          source: 'https://download.docker.com/linux/ubuntu'
-          distribution: xenial
-          components: stable
+          source: https://apt.dockerproject.org/repo
+          distribution: ubuntu-xenial
+          components: main
           architectures: amd64
           gpgkeys:
-            - 9DC858229FC7DD38854AE2D88D81803C0EBFCD88
+            - 58118E89F3A912897C070ADBF76221572C52609D
           publisher:
             component: docker
             distributions: