diff --git a/ContainerHandling/Get-BestGenericImageName.ps1 b/ContainerHandling/Get-BestGenericImageName.ps1
index 49e7ef249..4b2c638e6 100644
--- a/ContainerHandling/Get-BestGenericImageName.ps1
+++ b/ContainerHandling/Get-BestGenericImageName.ps1
@@ -40,10 +40,14 @@ try {
         # Everything before Windows Server 2022 uses ltsc2019
         $ltscVersion = 'ltsc2019'
     }
-    else {
+    elseif ("$hostOsVersion" -lt [System.Version]"10.0.26100.0") {
         # Default is ltsc2022
         $ltscVersion = 'ltsc2022'
     }
+    else {
+        # Default is ltsc2025
+        $ltscVersion = 'ltsc2025'
+    }
 
     if ($filesOnly) {
         $genericImageNameSetting = $bcContainerHelperConfig.genericImageNameFilesOnly.Replace('{1}', $ltscVersion)
diff --git a/ContainerHandling/New-NavImage.ps1 b/ContainerHandling/New-NavImage.ps1
index 24c313412..4e97ac7fa 100644
--- a/ContainerHandling/New-NavImage.ps1
+++ b/ContainerHandling/New-NavImage.ps1
@@ -139,7 +139,12 @@ try {
     }
 
     if ($os.BuildNumber -eq 26100) {
-        $hostOs = "24H2"
+        if ($isServerHost) {
+            $hostOs = "ltsc2025"
+        }
+        else {
+            $hostOs = "24H2"
+        }
     }
     elseif ($os.BuildNumber -eq 22631) {
         $hostOs = "23H2"
diff --git a/HelperFunctions.ps1 b/HelperFunctions.ps1
index b2f36739e..79d700d3b 100644
--- a/HelperFunctions.ps1
+++ b/HelperFunctions.ps1
@@ -1602,6 +1602,9 @@ function GetContainerOs {
     elseif ("$containerOsVersion".StartsWith('10.0.20348.')) {
         $containerOs = "ltsc2022"
     }
+    elseif ("$containerOsVersion".StartsWith('10.0.26100.')) {
+        $containerOs = "ltsc2025"
+    }
     else {
         $containerOs = "unknown"
     }
@@ -1618,7 +1621,12 @@ function GetHostOs {
 
     $hostOs = "Unknown/Insider build"
     if ($os.BuildNumber -eq 26100) {
-        $hostOs = "24H2"
+        if ($isServerHost) {
+            $hostOs = "ltsc2025"
+        }
+        else {
+            $hostOs = "24H2"
+        }
     }
     elseif ($os.BuildNumber -eq 22631) {
         $hostOs = "23H2"
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index c22da674c..b221a4a9d 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -9,6 +9,7 @@ Fixes issues determining test symbols for W1 and OnPrem artifacts not containing
 Add cache for search results of a NuGet feed
 Add new setting NuGetSearchResultsCacheRetentionPeriod (default: 600) to set the retention period (in seconds) for the search result cache of NuGet feeds (0 to disable the cache)
 Download-BcNuGetPackageToFolder checks all direct dependency versions of a package based on the NuSpec before downloading the whole package and its dependencies
+Add support for Windows 2025 Containers
 
 6.1.3
 Add setting ExcludeBuilds, which is an array of NuGet range specifications to exclude from Get-BcArtifactUrl. See more about range specification here: https://learn.microsoft.com/en-us/nuget/concepts/package-versioning?tabs=semver20sort#version-ranges