diff --git a/Dockerfile.dapper b/Dockerfile.dapper
index 1e1a5949..98728c48 100644
--- a/Dockerfile.dapper
+++ b/Dockerfile.dapper
@@ -82,6 +82,9 @@ ARG SYSTEM_DOCKER_VERSION=17.06-ros4
 ARG SYSTEM_DOCKER_URL_amd64=https://github.com/rancher/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-amd64-${SYSTEM_DOCKER_VERSION}.tgz
 ARG SYSTEM_DOCKER_URL_arm64=https://github.com/rancher/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-arm64-${SYSTEM_DOCKER_VERSION}.tgz
 
+ARG USER_DOCKER_VERSION=18.06.1
+ARG USER_DOCKER_ENGINE_VERSION=docker-${USER_DOCKER_VERSION}-ce
+
 ARG VMWARE_AUTOFORMAT=1
 ######################################################
 
@@ -118,6 +121,8 @@ ENV BUILD_DOCKER_URL=BUILD_DOCKER_URL_${ARCH} \
     SYSTEM_DOCKER_URL=SYSTEM_DOCKER_URL_${ARCH} \
     SYSTEM_DOCKER_URL_amd64=${SYSTEM_DOCKER_URL_amd64} \
     SYSTEM_DOCKER_URL_arm64=${SYSTEM_DOCKER_URL_arm64} \
+    USER_DOCKER_VERSION=${USER_DOCKER_VERSION} \
+    USER_DOCKER_ENGINE_VERSION=${USER_DOCKER_ENGINE_VERSION} \
     VMWARE_AUTOFORMAT=${VMWARE_AUTOFORMAT}
 ENV PATH=${GOPATH}/bin:/usr/local/go/bin:$PATH
 
diff --git a/os-config.tpl.yml b/os-config.tpl.yml
index 2e3e692b..e06ebb5a 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.06.1-ce
+      engine: {{.USER_DOCKER_ENGINE_VERSION}}
     {{else -}}
     docker:
-      engine: docker-18.06.1-ce
+      engine: {{.USER_DOCKER_ENGINE_VERSION}}
     {{end -}}
     network:
       dhcp_timeout: 10
@@ -349,9 +349,9 @@ rancher:
       - system-volumes
     docker:
       {{if eq "amd64" .ARCH -}}
-      image: {{.OS_REPO}}/os-docker:18.06.1{{.SUFFIX}}
+      image: {{.OS_REPO}}/os-docker:{{.USER_DOCKER_VERSION}}{{.SUFFIX}}
       {{else -}}
-      image: {{.OS_REPO}}/os-docker:18.06.1{{.SUFFIX}}
+      image: {{.OS_REPO}}/os-docker:{{.USER_DOCKER_VERSION}}{{.SUFFIX}}
       {{end -}}
       command: ros user-docker
       environment:
@@ -392,9 +392,9 @@ rancher:
     image: {{.OS_REPO}}/os
   docker:
     {{if eq "amd64" .ARCH -}}
-    engine: docker-18.06.1-ce
+    engine: {{.USER_DOCKER_ENGINE_VERSION}}
     {{else -}}
-    engine: docker-18.06.1-ce
+    engine: {{.USER_DOCKER_ENGINE_VERSION}}
     {{end -}}
     group: docker
     host: ["unix:///var/run/docker.sock"]