diff --git a/images.CI/linux-and-win/build-image.ps1 b/images.CI/linux-and-win/build-image.ps1
index 01b7c9488..6203ec616 100644
--- a/images.CI/linux-and-win/build-image.ps1
+++ b/images.CI/linux-and-win/build-image.ps1
@@ -16,10 +16,11 @@ param(
 
 if (-not (Test-Path $TemplatePath))
 {
-    Write-Error "'-Image' parameter is not valid. You have to specify correct image type."
+    Write-Error "'-TemplatePath' parameter is not valid. You have to specify correct Template Path"
     exit 1
 }
 
+$Image = [io.path]::GetFileNameWithoutExtension($TemplatePath)
 $TempResourceGroupName = "${ResourcesNamePrefix}_${Image}"
 $InstallPassword = [System.GUID]::NewGuid().ToString().ToUpper()