diff --git a/.drone.yml b/.drone.yml
index e158dfe..f27a579 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -79,10 +79,11 @@ steps:
     when:
       event: [push, tag]
   - name: build ecr plugin
-    image: plugins/docker
+    image: tphoney/docker:windows-1809-amd64
+    pull: never
     settings:
       dockerfile: docker/ecr/Dockerfile.windows.amd64.1809
-      repo: plugins/docker
+      repo: plugins/ecr
       username:
         from_secret: docker_username
       password:
@@ -93,7 +94,8 @@ steps:
     when:
       event: [push, tag]
   - name: build gcr plugin
-    image: plugins/docker
+    image: tphoney/docker:windows-1809-amd64
+    pull: never
     settings:
       dockerfile: docker/gcr/Dockerfile.windows.amd64.1809
       repo: plugins/gcr
@@ -107,7 +109,8 @@ steps:
     when:
       event: [push, tag]
   - name: build acr plugin
-    image: plugins/docker
+    image: tphoney/docker:windows-1809-amd64
+    pull: never
     settings:
       dockerfile: docker/acr/Dockerfile.windows.amd64.1809
       repo: plugins/acr
diff --git a/docker/docker/Dockerfile.windows.amd64.1809 b/docker/docker/Dockerfile.windows.amd64.1809
index bffc4b4..f699425 100644
--- a/docker/docker/Dockerfile.windows.amd64.1809
+++ b/docker/docker/Dockerfile.windows.amd64.1809
@@ -1,9 +1,10 @@
 # escape=`
-FROM mcr.microsoft.com/windows/servercore:1809 as download
+# using 1809-KB5021237-amd64 as base image, 1809-KB5022286-amd64 does not work
+FROM mcr.microsoft.com/windows/servercore:1809-KB5021237 as download
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV DOCKER_VERSION 18.09.1
+ENV DOCKER_VERSION 19.03.1
 
 RUN Invoke-WebRequest 'http://constexpr.org/innoextract/files/innoextract-1.6-windows.zip' -OutFile 'innoextract.zip' -UseBasicParsing ; `
     Expand-Archive innoextract.zip -DestinationPath C:\ ; `
@@ -13,7 +14,8 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
     Invoke-WebRequest $('https://github.com/docker/toolbox/releases/download/v{0}/DockerToolbox-{0}.exe' -f $env:DOCKER_VERSION) -OutFile 'dockertoolbox.exe' -UseBasicParsing
 RUN /innoextract.exe dockertoolbox.exe
 
-FROM mcr.microsoft.com/windows/nanoserver:1809
+FROM mcr.microsoft.com/windows/nanoserver:1809-KB5021237-amd64
+
 USER ContainerAdministrator
 
 LABEL maintainer="Drone.IO Community <drone-dev@googlegroups.com>" `
@@ -21,6 +23,7 @@ LABEL maintainer="Drone.IO Community <drone-dev@googlegroups.com>" `
   org.label-schema.vendor="Drone.IO Community" `
   org.label-schema.schema-version="1.0"
 
+RUN mkdir C:\bin
 COPY --from=download /windows/system32/netapi32.dll /windows/system32/netapi32.dll
 COPY --from=download /app/docker.exe C:/bin/docker.exe
 ADD release/windows/amd64/drone-docker.exe C:/bin/drone-docker.exe