diff --git a/docker/Dockerfile.windows.amd64 b/docker/Dockerfile.windows.1803
similarity index 59%
rename from docker/Dockerfile.windows.amd64
rename to docker/Dockerfile.windows.1803
index 0d5e9ca..cc85e51 100644
--- a/docker/Dockerfile.windows.amd64
+++ b/docker/Dockerfile.windows.1803
@@ -1,10 +1,10 @@
 # escape=`
-FROM plugins/base:windows-amd64
+FROM plugins/base:windows-1803
 
 LABEL maintainer="Drone.IO Community <drone-dev@googlegroups.com>" `
   org.label-schema.name="Drone Webhook" `
   org.label-schema.vendor="Drone.IO Community" `
   org.label-schema.schema-version="1.0"
 
-ADD release\drone-webhook.exe c:\drone-webhook.exe
-ENTRYPOINT [ "c:\\drone-webhook.exe" ]
+ADD release/windows/amd64/drone-webhook.exe C:/bin/drone-webhook.exe
+ENTRYPOINT [ "C:\\bin\\drone-webhook.exe" ]
diff --git a/docker/Dockerfile.windows.1809 b/docker/Dockerfile.windows.1809
new file mode 100644
index 0000000..f5d91c0
--- /dev/null
+++ b/docker/Dockerfile.windows.1809
@@ -0,0 +1,10 @@
+# escape=`
+FROM plugins/base:windows-1809
+
+LABEL maintainer="Drone.IO Community <drone-dev@googlegroups.com>" `
+  org.label-schema.name="Drone Webhook" `
+  org.label-schema.vendor="Drone.IO Community" `
+  org.label-schema.schema-version="1.0"
+
+ADD release/windows/amd64/drone-webhook.exe C:/bin/drone-webhook.exe
+ENTRYPOINT [ "C:\\bin\\drone-webhook.exe" ]
diff --git a/docker/manifest.tmpl b/docker/manifest.tmpl
index 7caf03b..912e788 100644
--- a/docker/manifest.tmpl
+++ b/docker/manifest.tmpl
@@ -27,7 +27,14 @@ manifests:
       architecture: arm
       os: linux
   -
-    image: plugins/webhook:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}windows-amd64
+    image: plugins/webhook:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}windows-1803
     platform:
       architecture: amd64
       os: windows
+      version: 1803
+  -
+    image: plugins/webhook:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}windows-1809
+    platform:
+      architecture: amd64
+      os: windows
+      version: 1809