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