diff --git a/os-config.tpl.yml b/os-config.tpl.yml
index 49008213..2e3e692b 100644
--- a/os-config.tpl.yml
+++ b/os-config.tpl.yml
@@ -8,10 +8,10 @@ rancher:
     hostname: {{.HOSTNAME_DEFAULT}}
     {{if eq "amd64" .ARCH -}}
     docker:
-      engine: docker-18.03.1-ce
+      engine: docker-18.06.1-ce
     {{else -}}
     docker:
-      engine: docker-18.03.1-ce
+      engine: docker-18.06.1-ce
     {{end -}}
     network:
       dhcp_timeout: 10
@@ -349,9 +349,9 @@ rancher:
       - system-volumes
     docker:
       {{if eq "amd64" .ARCH -}}
-      image: {{.OS_REPO}}/os-docker:18.03.1{{.SUFFIX}}
+      image: {{.OS_REPO}}/os-docker:18.06.1{{.SUFFIX}}
       {{else -}}
-      image: {{.OS_REPO}}/os-docker:18.03.1{{.SUFFIX}}
+      image: {{.OS_REPO}}/os-docker:18.06.1{{.SUFFIX}}
       {{end -}}
       command: ros user-docker
       environment:
@@ -392,9 +392,9 @@ rancher:
     image: {{.OS_REPO}}/os
   docker:
     {{if eq "amd64" .ARCH -}}
-    engine: docker-18.03.1-ce
+    engine: docker-18.06.1-ce
     {{else -}}
-    engine: docker-18.03.1-ce
+    engine: docker-18.06.1-ce
     {{end -}}
     group: docker
     host: ["unix:///var/run/docker.sock"]