diff --git a/nuget/Microsoft.WSL.Containers/build/Microsoft.WSL.Containers.common.targets b/nuget/Microsoft.WSL.Containers/build/Microsoft.WSL.Containers.common.targets
index 2454f2555..810c31260 100644
--- a/nuget/Microsoft.WSL.Containers/build/Microsoft.WSL.Containers.common.targets
+++ b/nuget/Microsoft.WSL.Containers/build/Microsoft.WSL.Containers.common.targets
@@ -7,4 +7,116 @@
     <ItemGroup>
         <ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)..\runtimes\win-$(WSLCSDK_Platform)\wslcsdk.dll" />
     </ItemGroup>
+
+    <!-- ================================================================== -->
+    <!-- Container Image Build Targets                                      -->
+    <!-- ================================================================== -->
+
+    <!-- Default properties -->
+    <PropertyGroup>
+        <WslcImageOutputDir Condition="'$(WslcImageOutputDir)' == ''">$(OutDir)</WslcImageOutputDir>
+        <WslcCliPath Condition="'$(WslcCliPath)' == '' AND Exists('$(ProgramW6432)\WSL\wslc.exe')">$(ProgramW6432)\WSL\wslc.exe</WslcCliPath>
+        <WslcCliPath Condition="'$(WslcCliPath)' == ''">wslc</WslcCliPath>
+    </PropertyGroup>
+
+    <!-- Default metadata for WslcImage items -->
+    <ItemDefinitionGroup>
+        <WslcImage>
+            <Tag>latest</Tag>
+            <OutputDir>$(WslcImageOutputDir)</OutputDir>
+        </WslcImage>
+    </ItemDefinitionGroup>
+
+    <!-- Auto-detection fallback: if no WslcImage declared, detect container/Dockerfile -->
+    <ItemGroup Condition="'@(WslcImage)' == '' AND Exists('$(ProjectDir)container\Dockerfile')">
+        <WslcImage Include="$(MSBuildProjectName)"
+                   Dockerfile="$(ProjectDir)container\Dockerfile"
+                   Context="$(ProjectDir)container"
+                   Sources="$(ProjectDir)container" />
+    </ItemGroup>
+
+    <ItemGroup Condition="'@(WslcImage)' == '' AND Exists('$(ProjectDir)docker\Dockerfile')">
+        <WslcImage Include="$(MSBuildProjectName)"
+                   Dockerfile="$(ProjectDir)docker\Dockerfile"
+                   Context="$(ProjectDir)docker"
+                   Sources="$(ProjectDir)docker" />
+    </ItemGroup>
+
+    <!-- Check that wslc CLI is installed -->
+    <Target Name="WslcCheckDependencies"
+            BeforeTargets="WslcBuildAllImages"
+            Condition="'@(WslcImage)' != ''">
+
+        <Exec Command="&quot;$(WslcCliPath)&quot; --version"
+              IgnoreExitCode="true"
+              ConsoleToMSBuild="true"
+              StandardOutputImportance="low"
+              StandardErrorImportance="low">
+            <Output TaskParameter="ExitCode" PropertyName="_WslcExitCode" />
+        </Exec>
+
+        <Error Condition="'$(_WslcExitCode)' != '0'"
+               Code="WSLC0001"
+               Text="The WSLC runtime was not found. Install WSL by running: wsl --install --no-distribution" />
+    </Target>
+
+    <!-- Outer target: dispatch each WslcImage to inner target via MSBuild task -->
+    <Target Name="WslcBuildAllImages"
+            AfterTargets="Build"
+            DependsOnTargets="WslcCheckDependencies"
+            Condition="'@(WslcImage)' != ''">
+
+        <MSBuild Projects="$(MSBuildProjectFullPath)"
+                 Targets="_WslcBuildSingleImage"
+                 Properties="Configuration=$(Configuration);Platform=$(Platform);_WslcName=%(WslcImage.Identity);_WslcTag=%(WslcImage.Tag);_WslcDockerfile=%(WslcImage.Dockerfile);_WslcContext=%(WslcImage.Context);_WslcSourceDir=%(WslcImage.Sources);_WslcOutput=%(WslcImage.OutputDir)" />
+    </Target>
+
+    <!--
+        Collect source files for incremental check.
+        Wildcards are expanded here in ItemGroup Include (not in Inputs attribute or MSBuild task Properties,
+        where they get escaped). Sources can be semicolon separated directory paths;
+        each is expanded with **\* to collect all files recursively.
+    -->
+    <Target Name="_WslcCollectSources" BeforeTargets="_WslcBuildSingleImage">
+        <ItemGroup>
+            <_WslcSourceDirs Include="$(_WslcSourceDir.Split(';'))" />
+            <_WslcSourceFiles Include="$(_WslcDockerfile)" />
+            <_WslcSourceFiles Include="%(_WslcSourceDirs.Identity)\**\*" Condition="'%(_WslcSourceDirs.Identity)' != ''" />
+        </ItemGroup>
+    </Target>
+
+    <!-- Inner target: build a single image with incremental check -->
+    <Target Name="_WslcBuildSingleImage"
+            DependsOnTargets="_WslcCollectSources"
+            Inputs="@(_WslcSourceFiles)"
+            Outputs="$(IntDir)wslc_$(_WslcName).marker">
+
+        <MakeDir Directories="$(IntDir)" />
+
+        <Message Importance="high"
+                 Text="WSLC: Building image '$(_WslcName):$(_WslcTag)'..." />
+
+        <Exec Command="&quot;$(WslcCliPath)&quot; image build -t &quot;$(_WslcName):$(_WslcTag)&quot; -f &quot;$(_WslcDockerfile)&quot; &quot;$(_WslcContext)&quot;"
+              ConsoleToMSBuild="true" />
+
+        <MakeDir Directories="$(_WslcOutput)" />
+
+        <Exec Command="&quot;$(WslcCliPath)&quot; image save -o &quot;$(_WslcOutput)\$(_WslcName).tar&quot; &quot;$(_WslcName):$(_WslcTag)&quot;"
+              ConsoleToMSBuild="true" />
+
+        <Touch Files="$(IntDir)wslc_$(_WslcName).marker" AlwaysCreate="true" />
+
+        <Message Importance="high"
+                 Text="WSLC: [$(_WslcName)] Image '$(_WslcName):$(_WslcTag)' saved to '$(_WslcOutput)\$(_WslcName).tar'." />
+    </Target>
+
+    <!-- Clean container artifacts -->
+    <Target Name="WslcClean"
+            AfterTargets="Clean"
+            Condition="'@(WslcImage)' != ''">
+
+        <Delete Files="$(IntDir)wslc_%(WslcImage.Identity).marker" />
+        <Delete Files="%(WslcImage.OutputDir)\%(WslcImage.Identity).tar" />
+    </Target>
+
 </Project>
\ No newline at end of file
diff --git a/nuget/Microsoft.WSL.Containers/build/native/Microsoft.WSL.Containers.targets b/nuget/Microsoft.WSL.Containers/build/native/Microsoft.WSL.Containers.targets
index 09823c7b0..a9cf3c22e 100644
--- a/nuget/Microsoft.WSL.Containers/build/native/Microsoft.WSL.Containers.targets
+++ b/nuget/Microsoft.WSL.Containers/build/native/Microsoft.WSL.Containers.targets
@@ -23,4 +23,52 @@
     </ItemDefinitionGroup>
 
     <Import Project="$(MSBuildThisFileDirectory)..\Microsoft.WSL.Containers.common.targets" />
+
+    <!-- ================================================================== -->
+    <!-- C++ specific: Write .tlog files for VS Fast Up-to-Date Check       -->
+    <!-- ================================================================== -->
+
+    <Target Name="_WslcWriteAllTlogs"
+            AfterTargets="WslcBuildAllImages"
+            Condition="'@(WslcImage)' != '' AND '$(TLogLocation)' != ''">
+
+        <MSBuild Projects="$(MSBuildProjectFullPath)"
+                 Targets="_WslcWriteSingleTlog"
+                 Properties="Configuration=$(Configuration);Platform=$(Platform);_WslcName=%(WslcImage.Identity);_WslcDockerfile=%(WslcImage.Dockerfile);_WslcSourceDir=%(WslcImage.Sources);_WslcTlogDir=$([MSBuild]::EnsureTrailingSlash('$(TLogLocation)'))" />
+    </Target>
+
+    <Target Name="_WslcWriteSingleTlog">
+        <ItemGroup>
+            <_WslcTlogSourceDirs Include="$(_WslcSourceDir.Split(';'))" />
+            <_WslcTlogInputs Include="$(_WslcDockerfile)" />
+            <_WslcTlogInputs Condition="'%(_WslcTlogSourceDirs.Identity)' != ''" Include="%(_WslcTlogSourceDirs.Identity)\**\*" />
+        </ItemGroup>
+
+        <PropertyGroup>
+            <_WslcDockerfileFullPath>$([System.IO.Path]::GetFullPath('$(_WslcDockerfile)'))</_WslcDockerfileFullPath>
+            <_WslcMarkerFullPath>$([System.IO.Path]::GetFullPath('$(IntDir)wslc_$(_WslcName).marker'))</_WslcMarkerFullPath>
+            <_WslcTarFullPath>$([System.IO.Path]::GetFullPath('$(WslcImageOutputDir)$(_WslcName).tar'))</_WslcTarFullPath>
+        </PropertyGroup>
+
+        <WriteLinesToFile
+            File="$(_WslcTlogDir)wslc.$(_WslcName).read.1.tlog"
+            Lines="^$(_WslcDockerfileFullPath);@(_WslcTlogInputs->'%(FullPath)')"
+            Overwrite="true"
+            Encoding="Unicode" />
+
+        <WriteLinesToFile
+            File="$(_WslcTlogDir)wslc.$(_WslcName).write.1.tlog"
+            Lines="^$(_WslcDockerfileFullPath);$(_WslcMarkerFullPath);$(_WslcTarFullPath)"
+            Overwrite="true"
+            Encoding="Unicode" />
+    </Target>
+
+    <!-- Clean tlog files -->
+    <Target Name="_WslcCleanTlogs"
+            AfterTargets="WslcClean"
+            Condition="'@(WslcImage)' != '' AND '$(TLogLocation)' != ''">
+        <Delete Files="$(TLogLocation)wslc.%(WslcImage.Identity).read.1.tlog" />
+        <Delete Files="$(TLogLocation)wslc.%(WslcImage.Identity).write.1.tlog" />
+    </Target>
+
 </Project>
\ No newline at end of file
diff --git a/nuget/Microsoft.WSL.Containers/build/net/Microsoft.WSL.Containers.targets b/nuget/Microsoft.WSL.Containers/build/net/Microsoft.WSL.Containers.targets
index 245e57a2c..cb1500527 100644
--- a/nuget/Microsoft.WSL.Containers/build/net/Microsoft.WSL.Containers.targets
+++ b/nuget/Microsoft.WSL.Containers/build/net/Microsoft.WSL.Containers.targets
@@ -11,4 +11,23 @@
 
     <Import Project="$(MSBuildThisFileDirectory)..\Microsoft.WSL.Containers.common.targets" />
 
+    <!-- ================================================================== -->
+    <!-- C# specific: CPS Up-to-Date Check for container source files       -->
+    <!-- ================================================================== -->
+
+    <!-- Register marker files as build outputs for CPS up-to-date check -->
+    <ItemGroup Condition="'$(UsingMicrosoftNETSdk)' == 'true'">
+        <UpToDateCheckBuilt Include="$(IntDir)wslc_%(WslcImage.Identity).marker" />
+    </ItemGroup>
+
+    <!-- Expand multi-directory Sources into UpToDateCheckInput at target time -->
+    <Target Name="_WslcRegisterUpToDateCheckInputs"
+            BeforeTargets="CollectUpToDateCheckBuiltDesignTime"
+            Condition="'$(UsingMicrosoftNETSdk)' == 'true' AND '@(WslcImage)' != ''">
+        <ItemGroup>
+            <_WslcUpToDateDirs Include="%(WslcImage.Sources)" Separator=";" />
+            <UpToDateCheckInput Include="%(_WslcUpToDateDirs.Identity)\**\*" Condition="'%(_WslcUpToDateDirs.Identity)' != ''" />
+        </ItemGroup>
+    </Target>
+
 </Project>
\ No newline at end of file
diff --git a/nuget/Microsoft.WSL.Containers/buildTransitive/Microsoft.WSL.Containers.targets b/nuget/Microsoft.WSL.Containers/buildTransitive/Microsoft.WSL.Containers.targets
new file mode 100644
index 000000000..b5ada5ff6
--- /dev/null
+++ b/nuget/Microsoft.WSL.Containers/buildTransitive/Microsoft.WSL.Containers.targets
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <Import Project="$(MSBuildThisFileDirectory)..\build\Microsoft.WSL.Containers.common.targets" />
+</Project>
diff --git a/nuget/Microsoft.WSL.Containers/buildTransitive/native/Microsoft.WSL.Containers.targets b/nuget/Microsoft.WSL.Containers/buildTransitive/native/Microsoft.WSL.Containers.targets
new file mode 100644
index 000000000..0f50deabc
--- /dev/null
+++ b/nuget/Microsoft.WSL.Containers/buildTransitive/native/Microsoft.WSL.Containers.targets
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <Import Project="$(MSBuildThisFileDirectory)..\..\build\native\Microsoft.WSL.Containers.targets" />
+</Project>
diff --git a/nuget/Microsoft.WSL.Containers/cmake/Microsoft.WSL.ContainersConfig.cmake b/nuget/Microsoft.WSL.Containers/cmake/Microsoft.WSL.ContainersConfig.cmake
index 0ea5f0642..07a38e4ae 100644
--- a/nuget/Microsoft.WSL.Containers/cmake/Microsoft.WSL.ContainersConfig.cmake
+++ b/nuget/Microsoft.WSL.Containers/cmake/Microsoft.WSL.ContainersConfig.cmake
@@ -55,3 +55,92 @@ unset(_wslcsdk_arch)
 unset(_wslcsdk_root)
 unset(_wslcsdk_include_dir)
 unset(_wslcsdk_lib_dir)
+
+# ============================================================================
+# Container Image Build Targets
+# ============================================================================
+#
+# Provides the wslc_add_image() function for declaring container image
+# build targets with incremental rebuild support.
+#
+# Usage:
+#   find_package(Microsoft.WSL.Containers REQUIRED)
+#
+#   wslc_add_image(
+#       NAME        my-server
+#       DOCKERFILE  container/Dockerfile
+#       CONTEXT     container/
+#       SOURCES     container/src/*.cpp container/src/*.h
+#       TAG         latest
+#       OUTPUT      ${CMAKE_BINARY_DIR}/images
+#   )
+#
+#   # With explicit image registry/name (IMAGE defaults to NAME if omitted):
+#   wslc_add_image(
+#       NAME        my-server
+#       IMAGE       ghcr.io/myorg/my-server
+#       TAG         v1.2.3
+#       DOCKERFILE  container/Dockerfile
+#       CONTEXT     container/
+#   )
+
+function(wslc_add_image)
+    cmake_parse_arguments(
+        PARSE_ARGV 0 ARG
+        ""                                      # options (none)
+        "NAME;IMAGE;TAG;DOCKERFILE;CONTEXT;OUTPUT" # one-value keywords
+        "SOURCES"                                # multi-value keywords
+    )
+
+    # Validate required arguments
+    if(NOT ARG_NAME)
+        message(FATAL_ERROR "wslc_add_image: NAME is required")
+    endif()
+    if(NOT ARG_DOCKERFILE)
+        message(FATAL_ERROR "wslc_add_image: DOCKERFILE is required")
+    endif()
+    if(NOT ARG_CONTEXT)
+        message(FATAL_ERROR "wslc_add_image: CONTEXT is required")
+    endif()
+
+    # Defaults
+    if(NOT ARG_IMAGE)
+        set(ARG_IMAGE "${ARG_NAME}")
+    endif()
+    if(NOT ARG_TAG)
+        set(ARG_TAG "latest")
+    endif()
+    if(NOT ARG_OUTPUT)
+        set(ARG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}")
+    endif()
+
+    # Find wslc CLI
+    if(NOT WSLC_CLI_PATH)
+        find_program(WSLC_CLI_PATH wslc PATHS "$ENV{ProgramW6432}/WSL" "$ENV{ProgramFiles}/WSL")
+        if(NOT WSLC_CLI_PATH)
+            message(FATAL_ERROR "wslc CLI not found. Install WSL by running: wsl --install --no-distribution")
+        endif()
+    endif()
+
+    set(_image_ref "${ARG_IMAGE}:${ARG_TAG}")
+    set(_marker "${CMAKE_CURRENT_BINARY_DIR}/wslc_${ARG_NAME}.marker")
+    set(_tar_output "${ARG_OUTPUT}/${ARG_NAME}.tar")
+
+    # Resolve source globs to file lists
+    file(GLOB_RECURSE _resolved_sources CONFIGURE_DEPENDS ${ARG_SOURCES})
+
+    add_custom_command(
+        OUTPUT "${_marker}"
+        COMMAND "${WSLC_CLI_PATH}" image build -t "${_image_ref}" -f "${ARG_DOCKERFILE}" "${ARG_CONTEXT}"
+        COMMAND ${CMAKE_COMMAND} -E make_directory "${ARG_OUTPUT}"
+        COMMAND "${WSLC_CLI_PATH}" image save -o "${_tar_output}" "${_image_ref}"
+        COMMAND ${CMAKE_COMMAND} -E touch "${_marker}"
+        DEPENDS ${_resolved_sources} "${ARG_DOCKERFILE}"
+        COMMENT "WSLC: Building and saving image '${_image_ref}' to '${_tar_output}'..."
+        VERBATIM
+    )
+
+    add_custom_target(wslc_image_${ARG_NAME} ALL
+        DEPENDS "${_marker}"
+    )
+endfunction()