diff --git a/Nhl.Api.Tests/Nhl.Api.Tests.csproj b/Nhl.Api.Tests/Nhl.Api.Tests.csproj
index 91509e91..3f258fbf 100644
--- a/Nhl.Api.Tests/Nhl.Api.Tests.csproj
+++ b/Nhl.Api.Tests/Nhl.Api.Tests.csproj
@@ -14,6 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\Nhl.Api.Domain\Nhl.Api.Domain.csproj" />
     <ProjectReference Include="..\Nhl.Api\Nhl.Api.csproj" />
   </ItemGroup>
 
diff --git a/Nhl.Api/Nhl.Api.csproj b/Nhl.Api/Nhl.Api.csproj
index 9d3e0ee3..438e6f1d 100644
--- a/Nhl.Api/Nhl.Api.csproj
+++ b/Nhl.Api/Nhl.Api.csproj
@@ -18,15 +18,31 @@
 	<PackageLicenseExpression>MIT</PackageLicenseExpression>
 	<PackageIcon>nhl-api-logo-128px-128px.png</PackageIcon>
 	<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+	<TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>
   </PropertyGroup>
 
   <ItemGroup>
-	<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+	<ProjectReference Include="..\Nhl.Api.Common\Nhl.Api.Common.csproj" PrivateAssets="All" />
+	<ProjectReference Include="..\Nhl.Api.Domain\Nhl.Api.Domain.csproj" PrivateAssets="All" />
   </ItemGroup>
 
+  <Target Name="CopyProjectReferencesToPackage" DependsOnTargets="BuildOnlySettings;ResolveReferences">
+	<ItemGroup>
+	  <!-- Filter out unnecessary files -->
+	  <_ReferenceCopyLocalPaths Include="@(ReferenceCopyLocalPaths->WithMetadataValue('ReferenceSourceTarget', 'ProjectReference')->WithMetadataValue('PrivateAssets', 'All'))"/>
+	</ItemGroup>
+
+	<!-- Print batches for debug purposes -->
+	<Message Text="Batch for .nupkg: ReferenceCopyLocalPaths = @(_ReferenceCopyLocalPaths), ReferenceCopyLocalPaths.DestinationSubDirectory = %(_ReferenceCopyLocalPaths.DestinationSubDirectory) Filename = %(_ReferenceCopyLocalPaths.Filename) Extension = %(_ReferenceCopyLocalPaths.Extension)" Importance="High" Condition="'@(_ReferenceCopyLocalPaths)' != ''" />
+
+	<ItemGroup>
+	  <!-- Add file to package with consideration of sub folder. If empty, the root folder is chosen. -->
+	  <BuildOutputInPackage Include="@(_ReferenceCopyLocalPaths)" TargetPath="%(_ReferenceCopyLocalPaths.DestinationSubDirectory)"/>
+	</ItemGroup>
+  </Target>
+
   <ItemGroup>
-	<ProjectReference Include="..\Nhl.Api.Common\Nhl.Api.Common.csproj" />
-	<ProjectReference Include="..\Nhl.Api.Domain\Nhl.Api.Domain.csproj" />
+	<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
   <ItemGroup>