diff --git a/.pipelines/ESRPSigning_core.json b/.pipelines/ESRPSigning_core.json
index e3ebffc20c..3a196634be 100644
--- a/.pipelines/ESRPSigning_core.json
+++ b/.pipelines/ESRPSigning_core.json
@@ -235,6 +235,14 @@
 
             "PowerToys.CmdPalModuleInterface.dll",
             "CmdPalKeyboardService.dll",
+            "PowerToys.ModuleContracts.dll",
+            "Awake.ModuleServices.dll",
+            "ColorPicker.ModuleServices.dll",
+            "Workspaces.ModuleServices.dll",
+            "Microsoft.CommandPalette.Extensions.dll",
+            "Microsoft.CommandPalette.Extensions.Toolkit.dll",
+            "Microsoft.CmdPal.Ext.PowerToys.dll",
+            "Microsoft.CmdPal.Ext.PowerToys.exe",
             "*Microsoft.CmdPal.UI_*.msix",
 
             "PowerToys.DSC.dll",
@@ -360,7 +368,9 @@
 
                 "UnitsNet.dll",
                 "UtfUnknown.dll",
-                "Wpf.Ui.dll"
+                "Wpf.Ui.dll",
+                "Shmuelie.WinRTServer.dll",
+                "ToolGood.Words.Pinyin.dll"
             ],
             "SigningInfo": {
                 "Operations": [
diff --git a/src/settings-ui/Settings.UI.XamlIndexBuilder/Settings.UI.XamlIndexBuilder.csproj b/src/settings-ui/Settings.UI.XamlIndexBuilder/Settings.UI.XamlIndexBuilder.csproj
index 1836b51248..dba7fdcd3b 100644
--- a/src/settings-ui/Settings.UI.XamlIndexBuilder/Settings.UI.XamlIndexBuilder.csproj
+++ b/src/settings-ui/Settings.UI.XamlIndexBuilder/Settings.UI.XamlIndexBuilder.csproj
@@ -35,14 +35,9 @@
 		<GeneratedJsonFile Condition="'$(GeneratedJsonFile)' == ''">$(MSBuildProjectDirectory)\..\Settings.UI\Assets\Settings\search.index.json</GeneratedJsonFile>
 	</PropertyGroup>
 	<Target Name="GenerateSearchIndexSelf" AfterTargets="Build">
-		<RemoveDir Directories="$(MSBuildProjectDirectory)\obj\ARM64;$(MSBuildProjectDirectory)\obj\x64;$(MSBuildProjectDirectory)\bin" ContinueOnError="WarnAndContinue" />
+		<RemoveDir Directories="$(MSBuildProjectDirectory)\obj\ARM64;$(MSBuildProjectDirectory)\obj\x64;$(MSBuildProjectDirectory)\bin" />
 		<MakeDir Directories="$([System.IO.Path]::GetDirectoryName('$(GeneratedJsonFile)'))" />
 		<Message Importance="high" Text="[XamlIndexBuilder] Generating search index. Root='$(XamlRootDir)'; Out='$(GeneratedJsonFile)'; Tool='$(TargetPath)'; DotNet='$(DotNetExe)'." />
 		<Exec Command="&quot;$(DotNetExe)&quot; &quot;$(TargetPath)&quot; &quot;$(XamlRootDir)&quot; &quot;$(GeneratedJsonFile)&quot;" />
-		<ItemGroup>
-			<_GeneratedSearchIndex Include="$(GeneratedJsonFile)" Condition="Exists('$(GeneratedJsonFile)')" />
-		</ItemGroup>
-		<Message Importance="high" Condition="Exists('$(GeneratedJsonFile)')" Text="[XamlIndexBuilder] Generated search index: '%(_GeneratedSearchIndex.FullPath)' (%(_GeneratedSearchIndex.FileSize) bytes)" />
-		<Message Importance="high" Condition="!Exists('$(GeneratedJsonFile)')" Text="[XamlIndexBuilder] ERROR: search index was not created at '$(GeneratedJsonFile)'" />
 	</Target>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/settings-ui/Settings.UI/PowerToys.Settings.csproj b/src/settings-ui/Settings.UI/PowerToys.Settings.csproj
index a74dcdfbf2..dd396112d3 100644
--- a/src/settings-ui/Settings.UI/PowerToys.Settings.csproj
+++ b/src/settings-ui/Settings.UI/PowerToys.Settings.csproj
@@ -142,6 +142,17 @@
 
 	<!-- Removed hard-coded resource exclusion. -->
 
+	<ItemGroup>
+		<!-- Ensure the generated search index is present in the project; only if it exists to prevent CS1566 in clean CI -->
+		<Content Include="$(GeneratedJsonFile)" Condition="Exists('$(GeneratedJsonFile)')">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
+		<!-- Embed the generated search index; logical name must match PrebuiltIndexResourceName -->
+		<EmbeddedResource Include="$(GeneratedJsonFile)" Condition="Exists('$(GeneratedJsonFile)')">
+			<LogicalName>Microsoft.PowerToys.Settings.UI.Assets.search.index.json</LogicalName>
+		</EmbeddedResource>
+	</ItemGroup>
+
 	<ItemGroup>
 		<None Update="Assets\Settings\icon.ico">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -202,20 +213,5 @@
 	<Target Name="BuildXamlIndexBeforeSettings" BeforeTargets="CoreCompile" Condition="'$(DesignTimeBuild)' != 'true'">
 		<Message Importance="high" Text="[Settings] Building XamlIndexBuilder prior to compile. Views='$(MSBuildProjectDirectory)\SettingsXAML\Views' Out='$(GeneratedJsonFile)'" />
 		<MSBuild Projects="..\Settings.UI.XamlIndexBuilder\Settings.UI.XamlIndexBuilder.csproj" Targets="Build" Properties="Configuration=$(Configuration);Platform=Any CPU;TargetFramework=net9.0;XamlViewsDir=$(MSBuildProjectDirectory)\SettingsXAML\Views;GeneratedJsonFile=$(GeneratedJsonFile)" />
-
-		<ItemGroup>
-			<_GeneratedSearchIndex Include="$(GeneratedJsonFile)" Condition="Exists('$(GeneratedJsonFile)')" />
-		</ItemGroup>
-		<Message Importance="high" Condition="Exists('$(GeneratedJsonFile)')" Text="[Settings] Search index exists: '%(_GeneratedSearchIndex.FullPath)' (%(_GeneratedSearchIndex.FileSize) bytes)" />
-		<Error Condition="!Exists('$(GeneratedJsonFile)')" Text="[Settings] XamlIndexBuilder did not produce expected search index at '$(GeneratedJsonFile)'." />
-
-		<ItemGroup>
-			<Content Include="$(GeneratedJsonFile)">
-				<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-			</Content>
-			<EmbeddedResource Include="$(GeneratedJsonFile)">
-				<LogicalName>Microsoft.PowerToys.Settings.UI.Assets.search.index.json</LogicalName>
-			</EmbeddedResource>
-		</ItemGroup>
 	</Target>
-</Project>
+</Project>
\ No newline at end of file