diff --git a/images/linux/scripts/installers/preimagedata.sh b/images/linux/scripts/installers/preimagedata.sh
index 136bfefa..62c6d3be 100644
--- a/images/linux/scripts/installers/preimagedata.sh
+++ b/images/linux/scripts/installers/preimagedata.sh
@@ -2,6 +2,8 @@
 
 imagedata_file=$IMAGEDATA_FILE
 image_version=$IMAGE_VERSION
+image_version_major=${image_version/.*/}
+image_version_minor=$(echo $image_version | cut -d "." -f 2)
 os_name=$(lsb_release -ds | sed "s/ /\\\n/g")
 os_version=$(lsb_release -rs)
 image_label="ubuntu-${os_version}"
@@ -9,8 +11,8 @@ version_major=${os_version/.*/}
 version_wo_dot=${os_version/./}
 github_url="https://github.com/actions/runner-images/blob"
 
-software_url="${github_url}/ubuntu${version_major}/${image_version}/images/linux/Ubuntu${version_wo_dot}-Readme.md"
-releaseUrl="https://github.com/actions/runner-images/releases/tag/ubuntu${version_major}%2F${image_version}"
+software_url="${github_url}/ubuntu${version_major}/${image_version_major}.${image_version_minor}/images/linux/Ubuntu${version_wo_dot}-Readme.md"
+releaseUrl="https://github.com/actions/runner-images/releases/tag/ubuntu${version_major}%2F${image_version_major}.${image_version_minor}"
 
 cat <<EOF > $imagedata_file
 [
diff --git a/images/win/scripts/Installers/Update-ImageData.ps1 b/images/win/scripts/Installers/Update-ImageData.ps1
index dc9f1482..0afa2bdd 100644
--- a/images/win/scripts/Installers/Update-ImageData.ps1
+++ b/images/win/scripts/Installers/Update-ImageData.ps1
@@ -4,17 +4,20 @@ $osName = $caption.Substring(0, $caption.LastIndexOf(" "))
 $osEdition = $caption.Substring($caption.LastIndexOf(" ")+1)
 $osVersion = $os.Version
 $imageVersion = $env:IMAGE_VERSION
+$imageVersionComponents = $imageVersion.Split('.')
+$imageMajorVersion = $imageVersionComponents[0]
+$imageMinorVersion = $imageVersionComponents[1]
 $imageDataFile = $env:IMAGEDATA_FILE
 $githubUrl="https://github.com/actions/runner-images/blob"
 
 if (Test-IsWin22) {
     $imageLabel = "windows-2022"
-    $softwareUrl = "${githubUrl}/win22/${imageVersion}/images/win/Windows2022-Readme.md"
-    $releaseUrl="https://github.com/actions/runner-images/releases/tag/win22%2F${imageVersion}"
+    $softwareUrl = "${githubUrl}/win22/$imageMajorVersion.$imageMinorVersion/images/win/Windows2022-Readme.md"
+    $releaseUrl="https://github.com/actions/runner-images/releases/tag/win22%2F$imageMajorVersion.$imageMinorVersion"
 } elseif (Test-IsWin19) {
     $imageLabel = "windows-2019"
-    $softwareUrl = "${githubUrl}/win19/${imageVersion}/images/win/Windows2019-Readme.md"
-    $releaseUrl="https://github.com/actions/runner-images/releases/tag/win19%2F${imageVersion}"
+    $softwareUrl = "${githubUrl}/win19/$imageMajorVersion.$imageMinorVersion/images/win/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"
 }