diff --git a/Dockerfile.windows b/Dockerfile.windows
index 8fe005e..814d545 100644
--- a/Dockerfile.windows
+++ b/Dockerfile.windows
@@ -1,5 +1,5 @@
 ARG golang=golang:nanoserver
-ARG target=microsoft/nanoserver:10.0.14393.2007
+ARG target=microsoft/nanoserver:10.0.14393.2068
 
 FROM $golang AS build
 
diff --git a/README.md b/README.md
index 1b95ed6..fce36f7 100644
--- a/README.md
+++ b/README.md
@@ -54,6 +54,6 @@ Image: stefanscherer/whoami
    - linux/amd64
    - linux/arm/v6
    - linux/arm64/v8
-   - windows/amd64:10.0.14393.2007
-   - windows/amd64:10.0.16299.19
+   - windows/amd64:10.0.14393.2068
+   - windows/amd64:10.0.16299.248
 ```
diff --git a/appveyor-deploy.ps1 b/appveyor-deploy.ps1
index 36c0ade..9a99c70 100644
--- a/appveyor-deploy.ps1
+++ b/appveyor-deploy.ps1
@@ -17,4 +17,4 @@ npm install -g rebase-docker-image
 rebase-docker-image `
   stefanscherer/whoami:windows-amd64-$env:APPVEYOR_REPO_TAG_NAME `
   -t stefanscherer/whoami:windows-amd64-$env:APPVEYOR_REPO_TAG_NAME-1709 `
-  -b microsoft/nanoserver:1709_KB4056892
+  -b microsoft/nanoserver:1709
diff --git a/travis-build.sh b/travis-build.sh
index 75a03c2..559045d 100755
--- a/travis-build.sh
+++ b/travis-build.sh
@@ -3,9 +3,15 @@ set -e
 
 docker version
 uname -a
-echo "Updating Docker engine to have multi-stage builds"
+
+echo "Updating Docker engine to have multi-stage builds and manifest command"
 sudo service docker stop
 curl -fsSL https://get.docker.com/ | sudo sh
+
+echo "Enabling docker client experimental features"
+mkdir -p ~/.docker
+echo '{ "experimental": "enabled" }' > ~/.docker/config.json
+
 docker version
 
 if [ -d tmp ]; then
diff --git a/travis-deploy.sh b/travis-deploy.sh
index 3ec52cc..c469c65 100755
--- a/travis-deploy.sh
+++ b/travis-deploy.sh
@@ -30,33 +30,25 @@ if [ "$ARCH" == "amd64" ]; then
   done
   set -e
 
-  echo "Downloading docker client with manifest command"
-  wget https://6582-88013053-gh.circle-artifacts.com/1/work/build/docker-linux-amd64
-  mv docker-linux-amd64 docker
-  chmod +x docker
-  ./docker version
-
-  set -x
-
   echo "Pushing manifest $image:$TRAVIS_TAG"
-  ./docker -D manifest create "$image:$TRAVIS_TAG" \
+  docker -D manifest create "$image:$TRAVIS_TAG" \
     "$image:linux-amd64-$TRAVIS_TAG" \
     "$image:linux-arm-$TRAVIS_TAG" \
     "$image:linux-arm64-$TRAVIS_TAG" \
     "$image:windows-amd64-$TRAVIS_TAG" \
     "$image:windows-amd64-$TRAVIS_TAG-1709"
-  ./docker manifest annotate "$image:$TRAVIS_TAG" "$image:linux-arm-$TRAVIS_TAG" --os linux --arch arm --variant v6
-  ./docker manifest annotate "$image:$TRAVIS_TAG" "$image:linux-arm64-$TRAVIS_TAG" --os linux --arch arm64 --variant v8
-  ./docker manifest push "$image:$TRAVIS_TAG"
+  docker manifest annotate "$image:$TRAVIS_TAG" "$image:linux-arm-$TRAVIS_TAG" --os linux --arch arm --variant v6
+  docker manifest annotate "$image:$TRAVIS_TAG" "$image:linux-arm64-$TRAVIS_TAG" --os linux --arch arm64 --variant v8
+  docker manifest push "$image:$TRAVIS_TAG"
 
   echo "Pushing manifest $image:latest"
-  ./docker -D manifest create "$image:latest" \
+  docker -D manifest create "$image:latest" \
     "$image:linux-amd64-$TRAVIS_TAG" \
     "$image:linux-arm-$TRAVIS_TAG" \
     "$image:linux-arm64-$TRAVIS_TAG" \
     "$image:windows-amd64-$TRAVIS_TAG" \
     "$image:windows-amd64-$TRAVIS_TAG-1709"
-  ./docker manifest annotate "$image:latest" "$image:linux-arm-$TRAVIS_TAG" --os linux --arch arm --variant v6
-  ./docker manifest annotate "$image:latest" "$image:linux-arm64-$TRAVIS_TAG" --os linux --arch arm64 --variant v8
-  ./docker manifest push "$image:latest"
+  docker manifest annotate "$image:latest" "$image:linux-arm-$TRAVIS_TAG" --os linux --arch arm --variant v6
+  docker manifest annotate "$image:latest" "$image:linux-arm64-$TRAVIS_TAG" --os linux --arch arm64 --variant v8
+  docker manifest push "$image:latest"
 fi