diff --git a/dotnet-tools.json b/dotnet-tools.json
index e56323b0952..8cc47019440 100644
--- a/dotnet-tools.json
+++ b/dotnet-tools.json
@@ -8,13 +8,6 @@
         "css-bundler"
       ],
       "rollForward": false
-    },
-    "bootstrapblazor.llmsdocsgenerator": {
-      "version": "10.0.2",
-      "commands": [
-        "llms-docs"
-      ],
-      "rollForward": false
     }
   }
 }
\ No newline at end of file
diff --git a/src/BootstrapBlazor.Server/Directory.Build.targets b/src/BootstrapBlazor.Server/Directory.Build.targets
index 124d0433260..38faf0eb713 100644
--- a/src/BootstrapBlazor.Server/Directory.Build.targets
+++ b/src/BootstrapBlazor.Server/Directory.Build.targets
@@ -1,25 +1,19 @@
 <Project>
 
-  <Target Name="LLMs" AfterTargets="Publish">
-    <Message Text="LLMs documentation generating ..." Importance="high"></Message>
-    <Exec Command="dotnet tool restore"></Exec>
-    <Exec Command="dotnet llms-docs --root=$(MSBuildThisFileDirectory) --output=$(PublishDir)"></Exec>
-  </Target>
-
-  <Target Name="CopyXmlDocs" AfterTargets="LLMs">
+  <Target Name="CollectXmlDocs">
     <ItemGroup>
       <XmlDocsToCopy Include="%(Reference.RelativeDir)BootstrapBlazor*.xml" />
     </ItemGroup>
-    <Message Text="Copying XML docs to output path: $(PublishDir)" Importance="High" />
-    <Copy SourceFiles="@(XmlDocsToCopy)" DestinationFolder="$(PublishDir)" SkipUnchangedFiles="true" Condition="Exists('%(RootDir)%(Directory)%(Filename)%(Extension)')" />
   </Target>
 
-  <Target Name="CopyXmlDocs2" BeforeTargets="Build">
-    <ItemGroup>
-      <XmlDocsToCopy Include="%(Reference.RelativeDir)BootstrapBlazor*.xml" />
-    </ItemGroup>
+  <Target Name="CopyXmlDocs2Output" BeforeTargets="Build" DependsOnTargets="CollectXmlDocs">
     <Message Text="Copying XML docs to output path: $(OutputPath)" Importance="High" />
     <Copy SourceFiles="@(XmlDocsToCopy)" DestinationFolder="$(OutputPath)" />
   </Target>
-  
+
+  <Target Name="CopyXmlDocs2Publish" AfterTargets="Publish" DependsOnTargets="CollectXmlDocs">
+    <Message Text="Copying XML docs to output path: $(PublishDir)" Importance="High" />
+    <Copy SourceFiles="@(XmlDocsToCopy)" DestinationFolder="$(PublishDir)" />
+  </Target>
+
 </Project>