diff --git a/GenesisCordonelInterface/RuntimePackage/Build/Copy.targets.xml b/GenesisCordonelInterface/RuntimePackage/Build/Copy.targets.xml
index d3373bc83..5bb31ad67 100644
--- a/GenesisCordonelInterface/RuntimePackage/Build/Copy.targets.xml
+++ b/GenesisCordonelInterface/RuntimePackage/Build/Copy.targets.xml
@@ -1,20 +1,15 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-	<!--
-    Creates a GCI runtime package after each successful build.
-    The package contains the standalone executable and all runtime dependencies.
-  -->
 	<Target Name="CopyGciRuntimeToRuntimePackage" AfterTargets="Build">
 
-		<!-- Destination directory for the GCI runtime package -->
 		<PropertyGroup>
 			<GciRuntimePackageDir>$(ProjectDir)RuntimePackage\Package\</GciRuntimePackageDir>
+			<TbfPackageCommonDir>$(ProjectDir)..\packages\Common\</TbfPackageCommonDir>
 		</PropertyGroup>
 
-		<!-- Ensure destination directory exists -->
 		<MakeDir Directories="$(GciRuntimePackageDir)" />
+		<MakeDir Directories="$(TbfPackageCommonDir)" />
 
-		<!-- Collect runtime files from the project output directory -->
 		<ItemGroup>
 			<GciRuntimeFiles Include="$(TargetDir)*.dll" />
 			<GciRuntimeFiles Include="$(TargetDir)*.exe" />
@@ -22,15 +17,19 @@
 			<GciRuntimeFiles Include="$(TargetDir)*.json" />
 		</ItemGroup>
 
-		<!-- Build output messages -->
 		<Message Text="Copying GCI runtime package to $(GciRuntimePackageDir)" Importance="High" />
-		<Message Text="Files: @(GciRuntimeFiles)" Importance="Normal" />
-
-		<!-- Copy runtime files into the package directory -->
 		<Copy
 		  SourceFiles="@(GciRuntimeFiles)"
 		  DestinationFolder="$(GciRuntimePackageDir)"
-		  SkipUnchangedFiles="false" />
+		  SkipUnchangedFiles="false"
+		  OverwriteReadOnlyFiles="true" />
+
+		<Message Text="Copying GCI runtime package to TBF package common: $(TbfPackageCommonDir)" Importance="High" />
+		<Copy
+		  SourceFiles="@(GciRuntimeFiles)"
+		  DestinationFolder="$(TbfPackageCommonDir)"
+		  SkipUnchangedFiles="false"
+		  OverwriteReadOnlyFiles="true" />
 
 	</Target>
 
diff --git a/TBF/Build/CopyGci.targets.xml b/TBF/Build/CopyGci.targets.xml
index 9eb4197ee..030bc99b6 100644
--- a/TBF/Build/CopyGci.targets.xml
+++ b/TBF/Build/CopyGci.targets.xml
@@ -1,35 +1,3 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-	<!--
-    Copies the prepared GCI runtime package into the TBF output directory.
-    This ensures all GCI dependencies are available next to TBF.exe.
-  -->
-	<Target Name="CopyGciRuntimePackageToTbfOutput" AfterTargets="Build">
-
-		<!-- Source directory containing the prepared GCI runtime package -->
-		<PropertyGroup>
-			<GciRuntimePackageDir>$(ProjectDir)..\GenesisCordonelInterface\RuntimePackage\Package\</GciRuntimePackageDir>
-		</PropertyGroup>
-
-		<!-- Collect runtime package files -->
-		<ItemGroup>
-			<GciRuntimeFiles Include="$(GciRuntimePackageDir)*.dll" />
-			<GciRuntimeFiles Include="$(GciRuntimePackageDir)*.exe" />
-			<GciRuntimeFiles Include="$(GciRuntimePackageDir)*.config" />
-			<GciRuntimeFiles Include="$(GciRuntimePackageDir)*.json" />
-		</ItemGroup>
-
-		<!-- Build output messages -->
-		<Message Text="Copying GCI runtime package to TBF output: $(TargetDir)" Importance="High" />
-		<Message Text="Source: $(GciRuntimePackageDir)" Importance="High" />
-		<Message Text="Files: @(GciRuntimeFiles)" Importance="Normal" />
-
-		<!-- Copy package files into TBF output directory -->
-		<Copy
-		  SourceFiles="@(GciRuntimeFiles)"
-		  DestinationFolder="$(TargetDir)"
-		  SkipUnchangedFiles="false" />
-
-	</Target>
-
 </Project>
\ No newline at end of file