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:
diff --git a/docker/host.yml b/docker/host.yml
index f7649b5..853a5d2 100644
--- a/docker/host.yml
+++ b/docker/host.yml
@@ -4,6 +4,9 @@
 parameters:
   docker:
     host:
+      pkgs:
+        - docker-ce
+        - python-docker
       experimental: true
       insecure_registries:
         - ${_param:cluster_vip_address}:5000
diff --git a/linux/system/repo/docker.yml b/linux/system/repo/docker.yml
index c527aa8..bb36728 100644
--- a/linux/system/repo/docker.yml
+++ b/linux/system/repo/docker.yml
@@ -3,7 +3,6 @@
     system:
       repo:
         docker:
-          source: "deb https://apt.dockerproject.org/repo ubuntu-${_param:linux_system_codename} main"
+          source: 'deb [arch=amd64] https://download.docker.com/linux/ubuntu/ ${_param:linux_system_codename} stable'
           architectures: amd64
-          key_id: 58118E89F3A912897C070ADBF76221572C52609D
-          key_server: keyserver.ubuntu.com
+          key_url: https://download.docker.com/linux/ubuntu/gpg