diff --git a/.drone.yml b/.drone.yml
index 13d5971..242c192 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -168,6 +168,47 @@ steps:
       event:
         - tag
 
+volumes:
+  - name: docker_pipe
+    host:
+      path: \\\\.\\pipe\\docker_engine
+---
+kind: pipeline
+name: windows-2004
+
+platform:
+  os: windows
+  arch: amd64
+  version: 2004
+
+# remove this and use upstream images when https://github.com/drone/drone-git/pull/25 is merged
+clone:
+  disable: true
+
+steps:
+  - name: clone
+    image: luthermonson/drone-git:windows-2004-amd64
+  - name: publish-hyperkube-windows-2004
+    image: luthermonson/drone-docker:2004
+    settings:
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+      dockerfile: Dockerfile.windows
+      repo: rancher/hyperkube
+      tag: "${DRONE_TAG}-windows-2004"
+      build_args:
+        - SERVERCORE_VERSION=2004
+    volumes:
+      - name: docker_pipe
+        path: \\\\.\\pipe\\docker_engine
+    when:
+      instance:
+        - drone-publish.rancher.io
+      event:
+        - tag
+
 volumes:
   - name: docker_pipe
     host:
@@ -195,4 +236,5 @@ depends_on:
 - linux-arm64
 - windows-1809
 - windows-1903
-- windows-1909
\ No newline at end of file
+- windows-1909
+- windows-2004
\ No newline at end of file
diff --git a/manifest.tmpl b/manifest.tmpl
index 1b805a8..89722af 100644
--- a/manifest.tmpl
+++ b/manifest.tmpl
@@ -28,3 +28,9 @@ manifests:
       architecture: amd64
       os: windows
       version: 1909
+  -
+    image: rancher/hyperkube:{{build.tag}}-windows-2004
+    platform:
+      architecture: amd64
+      os: windows
+      version: 2004