diff --git a/src/Tools/McpServer/.mcp/server.json b/src/Tools/McpServer/.mcp/server.json
index cf62222ff4..3ecec4291d 100644
--- a/src/Tools/McpServer/.mcp/server.json
+++ b/src/Tools/McpServer/.mcp/server.json
@@ -14,7 +14,7 @@
       "registryType": "nuget",
       "registryBaseUrl": "https://api.nuget.org",
       "identifier": "Microsoft.FluentUI.AspNetCore.McpServer",
-      "version": "5.0.0-preview.1",
+      "version": "0.0.1",
       "runtimeHint": "dnx",
       "transport": {
         "type": "stdio"
@@ -26,5 +26,5 @@
     "source": "github"
   },
   "title": "Fluent UI Blazor MCP Server",
-  "version": "5.0.0-preview.1"
+  "version": "0.0.1"
 }
diff --git a/src/Tools/McpServer/Microsoft.FluentUI.AspNetCore.McpServer.csproj b/src/Tools/McpServer/Microsoft.FluentUI.AspNetCore.McpServer.csproj
index 04520f2f14..81f00daa18 100644
--- a/src/Tools/McpServer/Microsoft.FluentUI.AspNetCore.McpServer.csproj
+++ b/src/Tools/McpServer/Microsoft.FluentUI.AspNetCore.McpServer.csproj
@@ -72,7 +72,8 @@
   <!-- Include README and MCP server manifest in package -->
   <ItemGroup>
     <None Include="README.md" Pack="true" PackagePath="\" />
-    <None Include=".mcp\server.json" Pack="true" PackagePath=".mcp\" />
+    <None Include=".mcp\server.json" />
+    <None Include="$(IntermediateOutputPath).mcp\server.json" Pack="true" PackagePath=".mcp\" />
     <None Include="..\..\..\icon.png" Pack="true" PackagePath="\" />
   </ItemGroup>
 
@@ -149,4 +150,33 @@
     <Message Text="MCP documentation JSON cleaned." Importance="high" Condition="Exists('$(McpDocumentationJsonPath)')" />
   </Target>
 
+  <!-- 
+    Target to update version in server.json before packing.
+    This copies server.json to intermediate directory and replaces version placeholders.
+  -->
+  <Target Name="UpdateMcpServerJsonVersion" BeforeTargets="BeforeBuild">
+    <PropertyGroup>
+      <McpServerJsonSource>$(MSBuildThisFileDirectory).mcp\server.json</McpServerJsonSource>
+      <McpServerJsonTarget>$(IntermediateOutputPath).mcp\server.json</McpServerJsonTarget>
+    </PropertyGroup>
+
+    <MakeDir Directories="$(IntermediateOutputPath).mcp" />
+
+    <!-- Read the source file -->
+    <ReadLinesFromFile File="$(McpServerJsonSource)">
+      <Output TaskParameter="Lines" ItemName="McpServerJsonLines" />
+    </ReadLinesFromFile>
+
+    <!-- Replace version in each line and write to target -->
+    <ItemGroup>
+      <McpServerJsonLinesUpdated Include="@(McpServerJsonLines)">
+        <Text>$([System.Text.RegularExpressions.Regex]::Replace('%(Identity)', '"version":\s*"[^"]*"', '"version": "$(Version)"'))</Text>
+      </McpServerJsonLinesUpdated>
+    </ItemGroup>
+
+    <WriteLinesToFile File="$(McpServerJsonTarget)" Lines="@(McpServerJsonLinesUpdated->'%(Text)')" Overwrite="true" />
+
+    <Message Text="Updated server.json version to $(Version)" Importance="high" />
+  </Target>
+
 </Project>