diff --git a/build/workflow/stage-build-packages.yml b/build/workflow/stage-build-packages.yml
index 83dc63859..85ebef33c 100644
--- a/build/workflow/stage-build-packages.yml
+++ b/build/workflow/stage-build-packages.yml
@@ -14,7 +14,6 @@ jobs:
 
     - task: MSBuild@1
       displayName: 'Build solution'
-      retryCountOnTaskFailure: 3
       inputs:
         solution: src/Uno.Toolkit.sln
         configuration: Release
diff --git a/samples/Directory.Packages.props b/samples/Directory.Packages.props
index 48bd526fe..0dd63dfbb 100644
--- a/samples/Directory.Packages.props
+++ b/samples/Directory.Packages.props
@@ -7,7 +7,7 @@
 		<PackageVersion Include="Microsoft.Extensions.Logging" Version="5.0.0" />
 		<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
 		<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
-		<PackageVersion Include="Microsoft.Net.Compilers.Toolset" Version="4.5.0-2.final" />
+		<PackageVersion Include="Microsoft.Net.Compilers.Toolset" Version="4.7.0-2.final" />
 		<!--
 			If, in the same solution, you are referencing a project that uses https://github.com/onovotny/MSBuildSdkExtras,
 			you need to make sure that the version provided here matches https://github.com/novotnyllc/MSBuildSdkExtras/blob/main/Source/MSBuild.Sdk.Extras/DefaultItems/ImplicitPackages.targets#L11.
diff --git a/samples/Uno.Toolkit.Samples/Directory.Build.targets b/samples/Uno.Toolkit.Samples/Directory.Build.targets
index 7daa20833..52ebb1bfd 100644
--- a/samples/Uno.Toolkit.Samples/Directory.Build.targets
+++ b/samples/Uno.Toolkit.Samples/Directory.Build.targets
@@ -1,4 +1,6 @@
 <Project ToolsVersion="15.0">
+	<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
+
 	<ItemGroup>
 		<!-- Remove WinUI files (Ctrl+F: UWP_WinUI_Removal) -->
 		<Page Remove="$(MSBuildThisFileDirectory)**\*.WinUI.xaml" Condition="'$(FrameworkLineage)' == 'UWP'" />
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index b965cc741..6b4ad6137 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -1,4 +1,20 @@
 <Project ToolsVersion="15.0">
 	<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
 	<Import Project="Directory.UnoMetadata.targets" />
+
+	<!-- This is a workaround, should be removed when this issue is fixed: https://github.com/unoplatform/uno/issues/13167 -->
+	<!-- Without this, the build gets flaky and sometimes fails with this error -->
+	<!-- C:\hostedtoolcache\windows\dotnet\sdk\7.0.306\Sdks\NuGet.Build.Tasks.Pack\buildCrossTargeting\NuGet.Build.Tasks.Pack.targets(221,5): error NU5019: File not found: 'D:\a\1\s\src\library\Uno.Toolkit.Cupertino\bin\Uno.Toolkit.WinUI.Cupertino\Release\net7.0-ios\Uno.Toolkit.WinUI.Cupertino.uprimarker'. [D:\a\1\s\src\library\Uno.Toolkit.Cupertino\Uno.Toolkit.WinUI.Cupertino.csproj] -->
+	<!-- Without this workaround target, what happens is that _UnoGeneratePriMarker was run before both _UnoAssetsGetCopyToPublishDirectory and finds ContentWithTargetPath being empty, so it does nothing -->
+	<!-- Then later, _UnoAssetsGetCopyToPublishDirectory is run and ContentWithTargetPath is now added, and NuGet packaging now expects the uprimarker to be present -->
+	<!-- Note that this error can go away with restarts, so it's a race condition -->
+	<Target Name="_WorkaroundBuildFlakiness"
+			BeforeTargets="_UnoGeneratePriMarker">
+		<ItemGroup>
+			<ContentWithTargetPath Include="@(_TransitiveItemsToCopyToOutputDirectory)">
+				<TargetPath>%(TargetPath)</TargetPath>
+				<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+			</ContentWithTargetPath>
+		</ItemGroup>
+	</Target>
 </Project>
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index fb790e16b..af9104460 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -35,7 +35,7 @@
 		<PackageVersion Include="Uno.UITest.Xamarin" Version="1.1.0-dev.32" />
 		<PackageVersion Include="Xamarin.UITest" Version="4.1.0" />
 		<PackageVersion Include="MSTest.TestFramework" Version="2.1.2" />
-		<PackageVersion Include="Microsoft.Net.Compilers.Toolset" Version="4.5.0-2.final" />
+		<PackageVersion Include="Microsoft.Net.Compilers.Toolset" Version="4.7.0-2.final" />
 		<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0-preview1.22518.1" />
 	</ItemGroup>
 </Project>
diff --git a/src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.WinUI.Cupertino.csproj b/src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.WinUI.Cupertino.csproj
index 0dc45f393..2a5934989 100644
--- a/src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.WinUI.Cupertino.csproj
+++ b/src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.WinUI.Cupertino.csproj
@@ -33,7 +33,7 @@
 	<ItemGroup Condition="$(_IsWindowsWinUI)">
 		<PackageReference Include="Microsoft.WindowsAppSDK" />
 		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
-		
+
 		<Page Remove="Generated\*.xaml" />
 	</ItemGroup>