diff --git a/build/repo.targets b/build/repo.targets
index 406bbf7028..d4f5530dee 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -57,7 +57,7 @@
       </PackageStoreManifestFiles>
     </ItemGroup>
 
-    <ZipArchive File="$(OutputZip)" SourceFiles="@(PackageCacheFiles)" WorkingDirectory="$(OutputPath)" />
+    <ZipArchive File="$(OutputZip)" SourceFiles="@(PackageCacheFiles)" WorkingDirectory="$(OutputPath)%(RIDs.Identity)\" />
 
     <Copy SourceFiles="%(PackageStoreManifestFiles.FullPath)" DestinationFiles="$(ArtifactsDir)%(PackageStoreManifestFiles.DestinationFile)" />