diff --git a/images/windows/scripts/build/Configure-ImageDataFile.ps1 b/images/windows/scripts/build/Configure-ImageDataFile.ps1
index 82bfa00b3..9c014ef95 100644
--- a/images/windows/scripts/build/Configure-ImageDataFile.ps1
+++ b/images/windows/scripts/build/Configure-ImageDataFile.ps1
@@ -28,7 +28,7 @@ if (Test-IsWin25) {
     $softwareUrl = "${githubUrl}/win19/$imageMajorVersion.$imageMinorVersion/images/windows/Windows2019-Readme.md"
     $releaseUrl = "https://github.com/actions/runner-images/releases/tag/win19%2F$imageMajorVersion.$imageMinorVersion"
 } else {
-    throw "Invalid platform version is found. Either Windows Server 2019 or 2022 are required"
+    throw "Invalid platform version is found. Either Windows Server 2019, 2022 or 2025 are required"
 }
 
 $json = @"
diff --git a/images/windows/templates/windows-2025.pkr.hcl b/images/windows/templates/windows-2025.pkr.hcl
index 8c9d73554..a4ba4ed9e 100644
--- a/images/windows/templates/windows-2025.pkr.hcl
+++ b/images/windows/templates/windows-2025.pkr.hcl
@@ -59,7 +59,7 @@ variable "image_folder" {
 
 variable "image_os" {
   type    = string
-  default = "win22"
+  default = "win25"
 }
 
 variable "image_version" {