diff --git a/.drone.jsonnet b/.drone.jsonnet
index 37cb48a..d723c92 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -22,6 +22,8 @@ local tags = [
   'windows-1909',
   'windows-2004',
   'windows-20H2',
+  'aws',
+  'windows-aws'
 ];
 
 local pipeline_name(tag) =
diff --git a/Build-All.ps1 b/Build-All.ps1
index 3eabfb9..be91a23 100644
--- a/Build-All.ps1
+++ b/Build-All.ps1
@@ -1,6 +1,6 @@
 param(
   [Parameter(Mandatory)]
-  [ValidateSet('1809','1903','1909','2004','20H2','windows-1809','windows-1903','windows-1909','windows-2004','windows-20H2','aws')]
+  [ValidateSet('1809','1903','1909','2004','20H2','windows-1809','windows-1903','windows-1909','windows-2004','windows-20H2','aws', 'windows-aws')]
   [string]$tag
 )
 
diff --git a/Publish-All.ps1 b/Publish-All.ps1
index d0ede24..303acac 100644
--- a/Publish-All.ps1
+++ b/Publish-All.ps1
@@ -1,6 +1,6 @@
 param(
   [Parameter(Mandatory)]
-  [ValidateSet('1809','1903','1909','2004','20H2','windows-1809','windows-1903','windows-1909','windows-2004','windows-20H2','aws')]
+  [ValidateSet('1809','1903','1909','2004','20H2','windows-1809','windows-1903','windows-1909','windows-2004','windows-20H2','aws', 'windows-aws')]
   [string]$tag
 )
 
diff --git a/base/Dockerfile.windows-aws b/base/Dockerfile.windows-aws
new file mode 100644
index 0000000..dc62ed9
--- /dev/null
+++ b/base/Dockerfile.windows-aws
@@ -0,0 +1,6 @@
+FROM mcr.microsoft.com/windows:1809@sha256:bf5f60839adcb5cfd775243bb86069deb88083217c656c456d90fbb685369aa5
+
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+RUN Set-ExecutionPolicy -ExecutionPolicy RemoteSigned;
+
diff --git a/renovate.json b/renovate.json
index 948b594..d6656ba 100644
--- a/renovate.json
+++ b/renovate.json
@@ -7,6 +7,7 @@
   "dockerfile": {
     "ignorePaths": [
       "base/Dockerfile.aws",
+      "base/Dockerfile.windows-aws",
       "scripts/",
       "scm/",
       "tools/",