diff --git a/Makefile b/Makefile
index 9271e7ed..023cfca4 100755
--- a/Makefile
+++ b/Makefile
@@ -37,9 +37,11 @@ clean:
 release: release-build openstack
 
 release-build:
+	mkdir -p dist
 	./.dapper release 2>&1 | tee dist/release.log
 
 itest:
+	mkdir -p dist
 	./.dapper integration-test 2>&1 | tee dist/itest.log
 
 openstack:
diff --git a/os-config.tpl.yml b/os-config.tpl.yml
index 2c75cb0b..bb9b2eff 100644
--- a/os-config.tpl.yml
+++ b/os-config.tpl.yml
@@ -6,7 +6,7 @@ rancher:
     hostname: {{.HOSTNAME_DEFAULT}}
     {{if eq "amd64" .ARCH -}}
     docker:
-      engine: docker-1.12.6
+      engine: docker-17.03.1-ce
     {{else -}}
     docker:
       engine: docker-1.11.2
@@ -294,7 +294,7 @@ rancher:
       - /opt:/opt
     docker:
       {{if eq "amd64" .ARCH -}}
-      image: {{.OS_REPO}}/os-docker:1.12.6{{.SUFFIX}}
+      image: {{.OS_REPO}}/os-docker:17.03.1{{.SUFFIX}}
       {{else -}}
       image: {{.OS_REPO}}/os-docker:1.11.2{{.SUFFIX}}
       {{end -}}
@@ -336,7 +336,7 @@ rancher:
     image: {{.OS_REPO}}/os
   docker:
     {{if eq "amd64" .ARCH -}}
-    engine: docker-1.12.6
+    engine: docker-17.03.1-ce
     {{else -}}
     engine: docker-1.11.2
     {{end -}}