diff --git a/libraries/src/AWS.Lambda.Powertools.BatchProcessing/AWS.Lambda.Powertools.BatchProcessing.csproj b/libraries/src/AWS.Lambda.Powertools.BatchProcessing/AWS.Lambda.Powertools.BatchProcessing.csproj
index 3a2fdfe8..54af1670 100644
--- a/libraries/src/AWS.Lambda.Powertools.BatchProcessing/AWS.Lambda.Powertools.BatchProcessing.csproj
+++ b/libraries/src/AWS.Lambda.Powertools.BatchProcessing/AWS.Lambda.Powertools.BatchProcessing.csproj
@@ -5,6 +5,7 @@
         <Description>Powertools for AWS Lambda (.NET) - BatchProcessing package.</Description>
         <AssemblyName>AWS.Lambda.Powertools.BatchProcessing</AssemblyName>
         <RootNamespace>AWS.Lambda.Powertools.BatchProcessing</RootNamespace>
+        <IncludeCommonFiles>true</IncludeCommonFiles>
     </PropertyGroup>
     <ItemGroup>
         <!--   Package versions are Centrally managed in Directory.Packages.props file  -->
@@ -12,9 +13,6 @@
         <PackageReference Include="Amazon.Lambda.DynamoDBEvents" />
         <PackageReference Include="Amazon.Lambda.KinesisEvents" />
         <PackageReference Include="Amazon.Lambda.SQSEvents" />
-        <ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj">
-            <Private>false</Private>
-            <ExcludeAssets>runtime</ExcludeAssets>
-        </ProjectReference>
+        <ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" Condition="'$(Configuration)'=='Debug'"/>
     </ItemGroup>
 </Project>
diff --git a/libraries/src/AWS.Lambda.Powertools.Idempotency/AWS.Lambda.Powertools.Idempotency.csproj b/libraries/src/AWS.Lambda.Powertools.Idempotency/AWS.Lambda.Powertools.Idempotency.csproj
index d86fc3b1..00150b72 100644
--- a/libraries/src/AWS.Lambda.Powertools.Idempotency/AWS.Lambda.Powertools.Idempotency.csproj
+++ b/libraries/src/AWS.Lambda.Powertools.Idempotency/AWS.Lambda.Powertools.Idempotency.csproj
@@ -6,6 +6,7 @@
         <Description>Powertools for AWS Lambda (.NET) - Idempotency package.</Description>
         <AssemblyName>AWS.Lambda.Powertools.Idempotency</AssemblyName>
         <RootNamespace>AWS.Lambda.Powertools.Idempotency</RootNamespace>
+        <IncludeCommonFiles>true</IncludeCommonFiles>
     </PropertyGroup>
 
 
@@ -14,13 +15,19 @@
         <!--   More info https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management   -->
         <PackageReference Include="Amazon.Lambda.Core"/>
         <PackageReference Include="AWSSDK.DynamoDBv2"/>
-        <ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj">
-            <Private>false</Private>
-            <ExcludeAssets>runtime</ExcludeAssets>
-        </ProjectReference>
-        <ProjectReference Include="..\AWS.Lambda.Powertools.JMESPath\AWS.Lambda.Powertools.JMESPath.csproj">
-            <Private>false</Private>
-            <ExcludeAssets>runtime</ExcludeAssets>
-        </ProjectReference>
+        <ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" Condition="'$(Configuration)'=='Debug'"/>
+        <ProjectReference Include="..\AWS.Lambda.Powertools.JMESPath\AWS.Lambda.Powertools.JMESPath.csproj" Condition="'$(Configuration)'=='Debug'"/>
+    </ItemGroup>
+
+    <!--    Include JMESPath files in projects that reference AWS.Lambda.Powertools.JMESPath -->
+    <!--    This is needed because of the way nuget expects dependencies to be nuget packages as well which is not what we want -->
+    <ItemGroup Condition="'$(Configuration)'=='Release'">
+
+        <ProjectReference Remove="..\AWS.Lambda.Powertools.JMESPath\AWS.Lambda.Powertools.JMESPath.csproj"/>
+
+        <Compile Include="..\AWS.Lambda.Powertools.JMESPath\**\*.cs">
+            <Link>JMESPath\%(RecursiveDir)%(Filename)%(Extension)</Link>
+        </Compile>
+        <Compile Remove="..\AWS.Lambda.Powertools.JMESPath\obj\**"/>
     </ItemGroup>
 </Project>
diff --git a/libraries/src/AWS.Lambda.Powertools.Logging/AWS.Lambda.Powertools.Logging.csproj b/libraries/src/AWS.Lambda.Powertools.Logging/AWS.Lambda.Powertools.Logging.csproj
index 03bdea7b..53d03f99 100644
--- a/libraries/src/AWS.Lambda.Powertools.Logging/AWS.Lambda.Powertools.Logging.csproj
+++ b/libraries/src/AWS.Lambda.Powertools.Logging/AWS.Lambda.Powertools.Logging.csproj
@@ -6,16 +6,14 @@
         <Description>Powertools for AWS Lambda (.NET) - Logging package.</Description>
         <AssemblyName>AWS.Lambda.Powertools.Logging</AssemblyName>
         <RootNamespace>AWS.Lambda.Powertools.Logging</RootNamespace>
+        <IncludeCommonFiles>true</IncludeCommonFiles>
     </PropertyGroup>
 
     <ItemGroup>
         <!--   Package versions are Centrally managed in Directory.Packages.props file  -->
         <!--   More info https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management   -->
-        <PackageReference Include="Microsoft.Extensions.Logging" />
-        <ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj">
-            <Private>false</Private>
-            <ExcludeAssets>runtime</ExcludeAssets>
-        </ProjectReference>
+        <PackageReference Include="Microsoft.Extensions.Logging"/>
+        <ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" Condition="'$(Configuration)'=='Debug'"/>
     </ItemGroup>
-
+    
 </Project>
diff --git a/libraries/src/AWS.Lambda.Powertools.Metrics/AWS.Lambda.Powertools.Metrics.csproj b/libraries/src/AWS.Lambda.Powertools.Metrics/AWS.Lambda.Powertools.Metrics.csproj
index b362b464..77ec07a3 100644
--- a/libraries/src/AWS.Lambda.Powertools.Metrics/AWS.Lambda.Powertools.Metrics.csproj
+++ b/libraries/src/AWS.Lambda.Powertools.Metrics/AWS.Lambda.Powertools.Metrics.csproj
@@ -5,13 +5,11 @@
         <Description>Powertools for AWS Lambda (.NET) - Metrics package.</Description>
         <AssemblyName>AWS.Lambda.Powertools.Metrics</AssemblyName>
         <RootNamespace>AWS.Lambda.Powertools.Metrics</RootNamespace>
+        <IncludeCommonFiles>true</IncludeCommonFiles>
     </PropertyGroup>
     
     <ItemGroup>
-        <ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj">
-            <Private>false</Private>
-            <ExcludeAssets>runtime</ExcludeAssets>
-        </ProjectReference>
+        <ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" Condition="'$(Configuration)'=='Debug'"/>
     </ItemGroup>
 
     <ItemGroup>
diff --git a/libraries/src/AWS.Lambda.Powertools.Parameters/AWS.Lambda.Powertools.Parameters.csproj b/libraries/src/AWS.Lambda.Powertools.Parameters/AWS.Lambda.Powertools.Parameters.csproj
index 91f3408e..526f6694 100644
--- a/libraries/src/AWS.Lambda.Powertools.Parameters/AWS.Lambda.Powertools.Parameters.csproj
+++ b/libraries/src/AWS.Lambda.Powertools.Parameters/AWS.Lambda.Powertools.Parameters.csproj
@@ -8,6 +8,7 @@
         <Description>Powertools for AWS Lambda (.NET) - Parameters package.</Description>
         <AssemblyName>AWS.Lambda.Powertools.Parameters</AssemblyName>
         <RootNamespace>AWS.Lambda.Powertools.Parameters</RootNamespace>
+        <IncludeCommonFiles>true</IncludeCommonFiles>
     </PropertyGroup>
 
     <ItemGroup>
@@ -19,10 +20,7 @@
         <PackageReference Include="AWSSDK.SecretsManager" />
         <PackageReference Include="AWSSDK.SimpleSystemsManagement" />
         <PackageReference Include="Microsoft.Extensions.Configuration" />
-        <ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj">
-            <Private>false</Private>
-            <ExcludeAssets>runtime</ExcludeAssets>
-        </ProjectReference>
+        <ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" Condition="'$(Configuration)'=='Debug'"/>
     </ItemGroup>
 
 </Project>
diff --git a/libraries/src/AWS.Lambda.Powertools.Tracing/AWS.Lambda.Powertools.Tracing.csproj b/libraries/src/AWS.Lambda.Powertools.Tracing/AWS.Lambda.Powertools.Tracing.csproj
index 146418f8..9eb67d6c 100644
--- a/libraries/src/AWS.Lambda.Powertools.Tracing/AWS.Lambda.Powertools.Tracing.csproj
+++ b/libraries/src/AWS.Lambda.Powertools.Tracing/AWS.Lambda.Powertools.Tracing.csproj
@@ -6,6 +6,8 @@
         <Description>Powertools for AWS Lambda (.NET) - Tracing package.</Description>
         <AssemblyName>AWS.Lambda.Powertools.Tracing</AssemblyName>
         <RootNamespace>AWS.Lambda.Powertools.Tracing</RootNamespace>
+
+        <IncludeCommonFiles>true</IncludeCommonFiles>
     </PropertyGroup>
    
     <ItemGroup>
@@ -14,10 +16,7 @@
         <PackageReference Include="AWSSDK.XRay" />
         <PackageReference Include="AWSXRayRecorder.Core" />
         <PackageReference Include="AWSXRayRecorder.Handlers.AwsSdk" />
-        <ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj">
-            <Private>false</Private>
-            <ExcludeAssets>runtime</ExcludeAssets>
-        </ProjectReference>
+        <ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" Condition="'$(Configuration)'=='Debug'"/>
     </ItemGroup>
 
 
diff --git a/libraries/src/Directory.Build.props b/libraries/src/Directory.Build.props
index 8f412fa4..32a59a04 100644
--- a/libraries/src/Directory.Build.props
+++ b/libraries/src/Directory.Build.props
@@ -26,11 +26,23 @@
         <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
         <IsAotCompatible>true</IsAotCompatible>
     </PropertyGroup>
-    
+
     <ItemGroup>
-        <None Include="README.md" Pack="true" PackagePath="\" />
-        <None Include="../../AWSLogo128x128.png" Pack="true" Visible="false" PackagePath="" />
+        <None Include="README.md" Pack="true" PackagePath="\"/>
+        <None Include="../../AWSLogo128x128.png" Pack="true" Visible="false" PackagePath=""/>
+    </ItemGroup>
+
+    <!--    Include Common files in projects that reference AWS.Lambda.Powertools.Common -->
+    <!--    This is needed because of the way nuget expects dependencies to be nuget packages as well which is not what we want -->
+    <ItemGroup Condition="'$(IncludeCommonFiles)' == 'true' AND '$(Configuration)'=='Release'">
+
+        <ProjectReference Remove="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj"/>
+        <PackageReference Include="AspectInjector"/>
+        <Compile Include="..\AWS.Lambda.Powertools.Common\**\*.cs">
+            <Link>Common\%(RecursiveDir)%(Filename)%(Extension)</Link>
+        </Compile>
+        <Compile Remove="..\AWS.Lambda.Powertools.Common\obj\**"/>
     </ItemGroup>
-    
-    
+
+
 </Project>
\ No newline at end of file
diff --git a/libraries/src/Directory.Build.targets b/libraries/src/Directory.Build.targets
deleted file mode 100644
index c9cb609c..00000000
--- a/libraries/src/Directory.Build.targets
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project>
-    <ItemGroup>
-        <PackageReference Include="AspectInjector" />
-    </ItemGroup>
-
-    <PropertyGroup>
-        <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>
-    </PropertyGroup>
-
-    <Target Name="CopyProjectReferencesToPackage" DependsOnTargets="BuildOnlySettings;ResolveReferences">
-        <ItemGroup>
-            <_ReferenceCopyLocalPaths Include="@(ReferenceCopyLocalPaths->WithMetadataValue('ReferenceSourceTarget', 'ProjectReference')->WithMetadataValue('PrivateAssets', 'All'))"/>
-        </ItemGroup>
-
-        <ItemGroup>
-            <BuildOutputInPackage Include="@(_ReferenceCopyLocalPaths)" TargetPath="%(_ReferenceCopyLocalPaths.DestinationSubDirectory)"/>
-        </ItemGroup>
-    </Target>
-</Project>
\ No newline at end of file