diff --git a/Jenkinsfile b/Jenkinsfile
index 0ea73e282..35a7c275e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -25,7 +25,7 @@ pipeline {
                 axes {
                     axis {
                         name 'IMAGE_TYPE'
-                        values 'linux', 'nanoserver-1809', 'nanoserver-ltsc2019', 'nanoserver-ltsc2022', 'windowsservercore-ltsc2019', 'windowsservercore-ltsc2022'
+                        values 'linux', 'nanoserver-1809', 'nanoserver-ltsc2019', 'nanoserver-ltsc2022', 'windowsservercore-1809', 'windowsservercore-ltsc2019', 'windowsservercore-ltsc2022'
                     }
                 }
                 stages {
diff --git a/windows/nanoserver/Dockerfile b/windows/nanoserver/Dockerfile
index eefbd9149..129287f57 100644
--- a/windows/nanoserver/Dockerfile
+++ b/windows/nanoserver/Dockerfile
@@ -27,7 +27,7 @@ ARG WINDOWS_VERSION_TAG=ltsc2019
 ARG WINDOWS_VERSION_FALLBACK_TAG=1809
 FROM eclipse-temurin:"${JAVA_VERSION}"-jdk-windowsservercore-"${WINDOWS_VERSION_FALLBACK_TAG}" AS jdk-core
 
-FROM mcr.microsoft.com/powershell:nanoserver-"${WINDOWS_VERSION_FALLBACK_TAG}"
+FROM mcr.microsoft.com/windows/nanoserver:"${WINDOWS_VERSION_TAG}"
 
 ARG JAVA_HOME="C:\openjdk-17"
 
diff --git a/windows/windowsservercore/Dockerfile b/windows/windowsservercore/Dockerfile
index 205630cc8..4e57960b7 100644
--- a/windows/windowsservercore/Dockerfile
+++ b/windows/windowsservercore/Dockerfile
@@ -27,7 +27,7 @@ ARG WINDOWS_VERSION_TAG=ltsc2019
 ARG WINDOWS_VERSION_FALLBACK_TAG=1809
 FROM eclipse-temurin:"${JAVA_VERSION}"-jdk-windowsservercore-"${WINDOWS_VERSION_FALLBACK_TAG}" AS jdk-core
 
-FROM mcr.microsoft.com/powershell:windowsservercore-"${WINDOWS_VERSION_FALLBACK_TAG}"
+FROM mcr.microsoft.com/windows/servercore:"${WINDOWS_VERSION_FALLBACK_TAG}"
 
 ARG JAVA_HOME="C:\openjdk-17"
 ENV JAVA_HOME=${JAVA_HOME}