diff --git a/scripts/ci-entrypoint.sh b/scripts/ci-entrypoint.sh
index 1ac219a9746..faa615fb79f 100755
--- a/scripts/ci-entrypoint.sh
+++ b/scripts/ci-entrypoint.sh
@@ -111,6 +111,8 @@ select_cluster_template() {
             export CLUSTER_TEMPLATE="${CLUSTER_TEMPLATE/custom-builds/custom-builds-machine-pool}"
         fi
     fi
+
+    echo "Using cluster template: ${CLUSTER_TEMPLATE}"
 }
 
 create_cluster() {
diff --git a/templates/test/ci/cluster-template-prow-ci-version.yaml b/templates/test/ci/cluster-template-prow-ci-version.yaml
index 0b7c2e777a6..9c9029ef091 100644
--- a/templates/test/ci/cluster-template-prow-ci-version.yaml
+++ b/templates/test/ci/cluster-template-prow-ci-version.yaml
@@ -412,7 +412,7 @@ spec:
         marketplace:
           offer: capi-windows
           publisher: cncf-upstream
-          sku: k8s-1dot23dot3-windows-2019-containerd
+          sku: k8s-1dot23dot3-${WINDOWS_SERVER_VERSION:=windows-2019}-containerd
           version: latest
       osDisk:
         diskSizeGB: 128
diff --git a/templates/test/ci/cluster-template-prow-external-cloud-provider-ci-version.yaml b/templates/test/ci/cluster-template-prow-external-cloud-provider-ci-version.yaml
index 963e2c09d20..7a1dc2c43c5 100644
--- a/templates/test/ci/cluster-template-prow-external-cloud-provider-ci-version.yaml
+++ b/templates/test/ci/cluster-template-prow-external-cloud-provider-ci-version.yaml
@@ -413,7 +413,7 @@ spec:
         marketplace:
           offer: capi-windows
           publisher: cncf-upstream
-          sku: k8s-1dot23dot3-windows-2019-containerd
+          sku: k8s-1dot23dot3-${WINDOWS_SERVER_VERSION:=windows-2019}-containerd
           version: latest
       osDisk:
         diskSizeGB: 128
diff --git a/templates/test/ci/prow-ci-version/patches/machine-deployment-ci-version-windows.yaml b/templates/test/ci/prow-ci-version/patches/machine-deployment-ci-version-windows.yaml
index baa1d5fff34..e1dcfe27d92 100644
--- a/templates/test/ci/prow-ci-version/patches/machine-deployment-ci-version-windows.yaml
+++ b/templates/test/ci/prow-ci-version/patches/machine-deployment-ci-version-windows.yaml
@@ -11,6 +11,6 @@ spec:
         marketplace:
           publisher: cncf-upstream
           offer: capi-windows
-          sku: k8s-1dot23dot3-windows-2019-containerd
+          sku: k8s-1dot23dot3-${WINDOWS_SERVER_VERSION:=windows-2019}-containerd
           version: "latest"