diff --git a/appveyor-deploy.ps1 b/appveyor-deploy.ps1
index 9a99c70..2aac154 100644
--- a/appveyor-deploy.ps1
+++ b/appveyor-deploy.ps1
@@ -18,3 +18,10 @@ 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
+
+Write-Host Rebasing image to produce 1803 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-1803 `
+  -b microsoft/nanoserver:1803
diff --git a/travis-deploy.sh b/travis-deploy.sh
index c469c65..d11a493 100755
--- a/travis-deploy.sh
+++ b/travis-deploy.sh
@@ -28,6 +28,11 @@ if [ "$ARCH" == "amd64" ]; then
     sleep 15
     echo "Try again"
   done
+  until docker run --rm stefanscherer/winspector "$image:windows-amd64-$TRAVIS_TAG-1803"
+  do
+    sleep 15
+    echo "Try again"
+  done
   set -e
 
   echo "Pushing manifest $image:$TRAVIS_TAG"
@@ -36,7 +41,8 @@ if [ "$ARCH" == "amd64" ]; then
     "$image:linux-arm-$TRAVIS_TAG" \
     "$image:linux-arm64-$TRAVIS_TAG" \
     "$image:windows-amd64-$TRAVIS_TAG" \
-    "$image:windows-amd64-$TRAVIS_TAG-1709"
+    "$image:windows-amd64-$TRAVIS_TAG-1709" \
+    "$image:windows-amd64-$TRAVIS_TAG-1803"
   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"
@@ -47,7 +53,8 @@ if [ "$ARCH" == "amd64" ]; then
     "$image:linux-arm-$TRAVIS_TAG" \
     "$image:linux-arm64-$TRAVIS_TAG" \
     "$image:windows-amd64-$TRAVIS_TAG" \
-    "$image:windows-amd64-$TRAVIS_TAG-1709"
+    "$image:windows-amd64-$TRAVIS_TAG-1709" \
+    "$image:windows-amd64-$TRAVIS_TAG-1803"
   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"