diff --git a/.drone.windows.yml b/.drone.windows.yml
index d186537..f1115e0 100644
--- a/.drone.windows.yml
+++ b/.drone.windows.yml
@@ -91,7 +91,7 @@ steps:
     password:
       from_secret: docker_password
     repo: plugins/webhook
-    tags: windows-1803
+    tags: windows-1803-amd64
     username:
       from_secret: docker_username
   volumes:
@@ -106,7 +106,7 @@ steps:
   image: plugins/docker
   settings:
     auto_tag: true
-    auto_tag_suffix: windows-1803
+    auto_tag_suffix: windows-1803-amd64
     daemon_off: true
     dockerfile: docker/Dockerfile.windows.1803
     password:
@@ -187,7 +187,7 @@ steps:
     password:
       from_secret: docker_password
     repo: plugins/webhook
-    tags: windows-1809
+    tags: windows-1809-amd64
     username:
       from_secret: docker_username
   volumes:
@@ -202,7 +202,7 @@ steps:
   image: plugins/docker
   settings:
     auto_tag: true
-    auto_tag_suffix: windows-1809
+    auto_tag_suffix: windows-1809-amd64
     daemon_off: true
     dockerfile: docker/Dockerfile.windows.1809
     password:
diff --git a/docker/manifest.tmpl b/docker/manifest.tmpl
index db52be2..dfdf912 100644
--- a/docker/manifest.tmpl
+++ b/docker/manifest.tmpl
@@ -22,13 +22,13 @@ manifests:
       architecture: arm
       os: linux
   -
-    image: plugins/webhook:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1803
+    image: plugins/webhook:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1803-amd64
     platform:
       architecture: amd64
       os: windows
       version: 1803
   -
-    image: plugins/webhook:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1809
+    image: plugins/webhook:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1809-amd64
     platform:
       architecture: amd64
       os: windows