diff --git a/blueprints/README.md b/blueprints/README.md
index cebbae73a..b3f667d83 100644
--- a/blueprints/README.md
+++ b/blueprints/README.md
@@ -24,10 +24,10 @@ the [examples/](../examples/) directory.
 
 An initial blueprint for the open source components of Docker for Mac is available in [docker-for-mac](docker-for-mac). The blueprint has support for controlling `dockerd` from the host via `vsudd` and port forwarding with VPNKit. It requires HyperKit, VPNKit and a Docker client on the host to run. The easiest way to install these at the moment is to install a recent version of Docker for Mac.
 
-To build it with Docker 17.06:
+To build it with the latest Docker CE:
 
 ```
-$ moby build -name docker-for-mac base.yml docker-17.06-ce.yml
+$ moby build -name docker-for-mac base.yml docker-ce.yml
 ```
 
 To run the VM with a 500M disk:
diff --git a/blueprints/docker-for-mac/docker-17.06-ce.yml b/blueprints/docker-for-mac/docker-ce.yml
similarity index 97%
rename from blueprints/docker-for-mac/docker-17.06-ce.yml
rename to blueprints/docker-for-mac/docker-ce.yml
index 07d549124..345b74353 100644
--- a/blueprints/docker-for-mac/docker-17.06-ce.yml
+++ b/blueprints/docker-for-mac/docker-ce.yml
@@ -3,7 +3,7 @@ services:
   # Bind mounts /var/run to allow vsudd to connect to docker.sock, /var/vpnkit
   # for vpnkit coordination and /var/config/docker for the configuration file.
   - name: docker-dfm
-    image: docker:17.06.1-ce-dind
+    image: docker:17.07.0-ce-dind
     capabilities:
      - all
     net: host
diff --git a/examples/docker.yml b/examples/docker.yml
index b6ad04448..9ca1cd616 100644
--- a/examples/docker.yml
+++ b/examples/docker.yml
@@ -28,7 +28,7 @@ services:
   - name: ntpd
     image: linuxkit/openntpd:0d7befc79842849d0b88d6c3b64200e340d7cf67
   - name: docker
-    image: docker:17.06.1-ce-dind
+    image: docker:17.07.0-ce-dind
     capabilities:
      - all
     net: host
diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml
index 830105f96..f892b8cea 100644
--- a/projects/compose/compose-dynamic.yml
+++ b/projects/compose/compose-dynamic.yml
@@ -25,7 +25,7 @@ services:
   - name: ntpd
     image: linuxkit/openntpd:0d7befc79842849d0b88d6c3b64200e340d7cf67
   - name: docker
-    image: docker:17.06.1-ce-dind
+    image: docker:17.07.0-ce-dind
     capabilities:
      - all
     mounts:
diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml
index c73b415e9..aa2c20600 100644
--- a/projects/compose/compose-static.yml
+++ b/projects/compose/compose-static.yml
@@ -25,7 +25,7 @@ services:
   - name: ntpd
     image: linuxkit/openntpd:0d7befc79842849d0b88d6c3b64200e340d7cf67
   - name: docker
-    image: docker:17.06.1-ce-dind
+    image: docker:17.07.0-ce-dind
     capabilities:
      - all
     mounts:
diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube-master.yml
index aa50449b8..51bb987cc 100644
--- a/projects/kubernetes/kube-master.yml
+++ b/projects/kubernetes/kube-master.yml
@@ -33,7 +33,7 @@ services:
   - name: sshd
     image: linuxkit/sshd:505a985d7bd7a90f15eca9cb4dc6ec92789d51a0
   - name: docker
-    image: docker:17.06.1-ce-dind
+    image: docker:17.07.0-ce-dind
     capabilities:
      - all
     pid: host
diff --git a/projects/kubernetes/kube-node.yml b/projects/kubernetes/kube-node.yml
index 2dc8d0121..bfe7e8a54 100644
--- a/projects/kubernetes/kube-node.yml
+++ b/projects/kubernetes/kube-node.yml
@@ -33,7 +33,7 @@ services:
   - name: sshd
     image: linuxkit/sshd:505a985d7bd7a90f15eca9cb4dc6ec92789d51a0
   - name: docker
-    image: docker:17.06.1-ce-dind
+    image: docker:17.07.0-ce-dind
     capabilities:
      - all
     pid: host
diff --git a/test/cases/000_build/200_blueprints/010_docker_for_mac/test.sh b/test/cases/000_build/200_blueprints/010_docker_for_mac/test.sh
index 61827538d..892ca0fed 100644
--- a/test/cases/000_build/200_blueprints/010_docker_for_mac/test.sh
+++ b/test/cases/000_build/200_blueprints/010_docker_for_mac/test.sh
@@ -18,7 +18,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -name "${IMAGE_NAME}" "${LINUXKIT_BLUEPRINTS_DIR}/${IMAGE_NAME}/base.yml" "${LINUXKIT_BLUEPRINTS_DIR}/${IMAGE_NAME}/docker-17.06-ce.yml" 
+moby build -name "${IMAGE_NAME}" "${LINUXKIT_BLUEPRINTS_DIR}/${IMAGE_NAME}/base.yml" "${LINUXKIT_BLUEPRINTS_DIR}/${IMAGE_NAME}/docker-ce.yml" 
 
 exit 0
 
diff --git a/test/cases/030_security/000_docker-bench/test-docker-bench.yml b/test/cases/030_security/000_docker-bench/test-docker-bench.yml
index a245789b7..497407865 100644
--- a/test/cases/030_security/000_docker-bench/test-docker-bench.yml
+++ b/test/cases/030_security/000_docker-bench/test-docker-bench.yml
@@ -22,7 +22,7 @@ services:
   - name: dhcpcd
     image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7
   - name: docker
-    image: docker:17.06.1-ce-dind
+    image: docker:17.07.0-ce-dind
     capabilities:
      - all
     mounts: