diff --git a/docker/Dockerfile.windows.1709 b/docker/Dockerfile.windows.1709
new file mode 100644
index 0000000..0d17be3
--- /dev/null
+++ b/docker/Dockerfile.windows.1709
@@ -0,0 +1,21 @@
+FROM microsoft/windowsservercore:1709 AS git
+
+ENV GIT_VERSION 2.14.1
+ENV GIT_DOWNLOAD_URL https://github.com/git-for-windows/git/releases/download/v${GIT_VERSION}.windows.1/MinGit-${GIT_VERSION}-64-bit.zip
+ENV GIT_SHA256 65c12e4959b8874187b68ec37e532fe7fc526e10f6f0f29e699fa1d2449e7d92
+
+RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; \
+		Invoke-WebRequest -UseBasicParsing $env:GIT_DOWNLOAD_URL -OutFile git.zip; \
+    if ((Get-FileHash git.zip -Algorithm sha256).Hash -ne $env:GIT_SHA256) {exit 1} ; \
+    Expand-Archive git.zip -DestinationPath C:\git; \
+    Remove-Item git.zip
+
+FROM microsoft/nanoserver:1709
+USER ContainerAdministrator
+COPY --from=git /git /git
+
+RUN setx /m PATH "%PATH%;C:\git\mingw64\bin;C:\git\usr\bin"
+
+ADD windows/* /
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+ENTRYPOINT [ "\\clone.ps1" ]
diff --git a/docker/Dockerfile.windows.1803 b/docker/Dockerfile.windows.1803
new file mode 100644
index 0000000..5e99c55
--- /dev/null
+++ b/docker/Dockerfile.windows.1803
@@ -0,0 +1,21 @@
+FROM microsoft/windowsservercore:1803 AS git
+
+ENV GIT_VERSION 2.14.1
+ENV GIT_DOWNLOAD_URL https://github.com/git-for-windows/git/releases/download/v${GIT_VERSION}.windows.1/MinGit-${GIT_VERSION}-64-bit.zip
+ENV GIT_SHA256 65c12e4959b8874187b68ec37e532fe7fc526e10f6f0f29e699fa1d2449e7d92
+
+RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; \
+		Invoke-WebRequest -UseBasicParsing $env:GIT_DOWNLOAD_URL -OutFile git.zip; \
+    if ((Get-FileHash git.zip -Algorithm sha256).Hash -ne $env:GIT_SHA256) {exit 1} ; \
+    Expand-Archive git.zip -DestinationPath C:\git; \
+    Remove-Item git.zip
+
+FROM microsoft/nanoserver:1803
+USER ContainerAdministrator
+COPY --from=git /git /git
+
+RUN setx /m PATH "%PATH%;C:\git\mingw64\bin;C:\git\usr\bin"
+
+ADD windows/* /
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+ENTRYPOINT [ "\\clone.ps1" ]
diff --git a/docker/Dockerfile.windows.amd64 b/docker/Dockerfile.windows.amd64
deleted file mode 100644
index afcaa9d..0000000
--- a/docker/Dockerfile.windows.amd64
+++ /dev/null
@@ -1 +0,0 @@
-FROM microsoft/nanoserver:10.0.14393.1593