diff --git a/appveyor-build.ps1 b/appveyor-build.ps1
index 0f15874..f0e6143 100644
--- a/appveyor-build.ps1
+++ b/appveyor-build.ps1
@@ -2,9 +2,6 @@ $ErrorActionPreference = 'Stop';
 $files = ""
 Write-Host Starting build
 
-Write-Host Updating base images
-docker pull microsoft/nanoserver
-
-docker build -t whoami -f Dockerfile.windows .
+docker build --pull -t whoami -f Dockerfile.windows .
 
 docker images
diff --git a/appveyor-deploy.ps1 b/appveyor-deploy.ps1
index 0bead66..9a99c70 100644
--- a/appveyor-deploy.ps1
+++ b/appveyor-deploy.ps1
@@ -11,3 +11,10 @@ docker login -u="$env:DOCKER_USER" -p="$env:DOCKER_PASS"
 docker tag whoami stefanscherer/whoami:windows-amd64-$env:APPVEYOR_REPO_TAG_NAME
 
 docker push stefanscherer/whoami:windows-amd64-$env:APPVEYOR_REPO_TAG_NAME
+
+Write-Host Rebasing image to produce 1709 variant
+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