diff --git a/.github/workflows/publish-artifacts-examples-tests.yml b/.github/workflows/publish-artifacts-examples-tests.yml
index fe874cd84..5856ee33a 100644
--- a/.github/workflows/publish-artifacts-examples-tests.yml
+++ b/.github/workflows/publish-artifacts-examples-tests.yml
@@ -92,10 +92,18 @@ jobs:
               packageName=$(basename $package .nupkg | sed -E 's/(.*)\.([0-9]+\.[0-9]+\.[0-9]+.*)$/\1/')
               packageVersion=$(basename $package .nupkg | sed -E 's/(.*)\.([0-9]+\.[0-9]+\.[0-9]+.*)$/\2/')
           
-              # Check if project references this package
+              # Check if project references this package via PackageReference
               if grep -q "<PackageReference.*Include=\"$packageName\"" "$project"; then
-                echo "  - Updating $packageName to version $packageVersion"
-                # Use --no-restore to avoid restoring during each add
+                echo "  - Updating PackageReference $packageName to version $packageVersion"
+                dotnet add "$project" package "$packageName" --version "$packageVersion" --source "local" --no-restore
+              fi
+              
+              # Check if project references this package via ProjectReference and convert to PackageReference
+              if grep -q "<ProjectReference.*$packageName\.csproj" "$project"; then
+                echo "  - Converting ProjectReference $packageName to PackageReference version $packageVersion"
+                # Remove the ProjectReference line
+                sed -i "/<ProjectReference.*$packageName\.csproj/d" "$project"
+                # Add PackageReference
                 dotnet add "$project" package "$packageName" --version "$packageVersion" --source "local" --no-restore
               fi
             done
diff --git a/docs/getting-started/logger/aot.md b/docs/getting-started/logger/aot.md
index 08edfa7c0..bf2609424 100644
--- a/docs/getting-started/logger/aot.md
+++ b/docs/getting-started/logger/aot.md
@@ -173,7 +173,7 @@ public partial class LambdaFunctionJsonSerializerContext : JsonSerializerContext
 
     <ItemGroup>
         <PackageReference Include="Amazon.Lambda.RuntimeSupport" Version="1.12.0"/>
-        <PackageReference Include="Amazon.Lambda.Core" Version="2.5.0"/>
+        <PackageReference Include="Amazon.Lambda.Core" Version="2.8.0"/>
         <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4"/>
         <PackageReference Include="AWS.Lambda.Powertools.Logging" Version="2.0.0"/>
     </ItemGroup>
diff --git a/docs/migration-guide-v3.md b/docs/migration-guide-v3.md
index 66cec8963..3f7711757 100644
--- a/docs/migration-guide-v3.md
+++ b/docs/migration-guide-v3.md
@@ -56,7 +56,7 @@ Migrate from AWS SDK v3 to v4. Update package references in your `.csproj`:
 **After (v3):**
 ```xml
 <ItemGroup>
-  <PackageReference Include="Amazon.Lambda.Core" Version="2.7.0" />
+  <PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
   <PackageReference Include="AWSSDK.Core" Version="4.0.*" />
   <PackageReference Include="AWSSDK.DynamoDBv2" Version="4.0.*" />
   <PackageReference Include="AWSSDK.S3" Version="4.0.*" />
diff --git a/examples/AOT/AOT_Logging/src/AOT_Logging/AOT_Logging.csproj b/examples/AOT/AOT_Logging/src/AOT_Logging/AOT_Logging.csproj
index 8e44c5cbe..9639b3d52 100644
--- a/examples/AOT/AOT_Logging/src/AOT_Logging/AOT_Logging.csproj
+++ b/examples/AOT/AOT_Logging/src/AOT_Logging/AOT_Logging.csproj
@@ -20,6 +20,8 @@
         <PackageReference Include="Amazon.Lambda.RuntimeSupport" Version="1.14.1" />
         <PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
         <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4"/>
-        <PackageReference Include="AWS.Lambda.Powertools.Logging" Version="3.0.2" />
+    </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\..\..\..\..\libraries\src\AWS.Lambda.Powertools.Logging\AWS.Lambda.Powertools.Logging.csproj" />
     </ItemGroup>
 </Project>
diff --git a/examples/AOT/AOT_Metrics/src/AOT_Metrics/AOT_Metrics.csproj b/examples/AOT/AOT_Metrics/src/AOT_Metrics/AOT_Metrics.csproj
index 59ae45cb2..636e83947 100644
--- a/examples/AOT/AOT_Metrics/src/AOT_Metrics/AOT_Metrics.csproj
+++ b/examples/AOT/AOT_Metrics/src/AOT_Metrics/AOT_Metrics.csproj
@@ -20,6 +20,8 @@
         <PackageReference Include="Amazon.Lambda.RuntimeSupport" Version="1.14.1" />
         <PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
         <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4"/>
-        <PackageReference Include="AWS.Lambda.Powertools.Metrics" Version="3.0.2" />
+    </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\..\..\..\..\libraries\src\AWS.Lambda.Powertools.Metrics\AWS.Lambda.Powertools.Metrics.csproj" />
     </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/examples/AOT/AOT_Tracing/src/AOT_Tracing/AOT_Tracing.csproj b/examples/AOT/AOT_Tracing/src/AOT_Tracing/AOT_Tracing.csproj
index 88fc39b70..dd428701e 100644
--- a/examples/AOT/AOT_Tracing/src/AOT_Tracing/AOT_Tracing.csproj
+++ b/examples/AOT/AOT_Tracing/src/AOT_Tracing/AOT_Tracing.csproj
@@ -20,6 +20,8 @@
         <PackageReference Include="Amazon.Lambda.RuntimeSupport" Version="1.14.1" />
         <PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
         <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4"/>
-        <PackageReference Include="AWS.Lambda.Powertools.Tracing" Version="3.0.2" />
+    </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\..\..\..\..\libraries\src\AWS.Lambda.Powertools.Tracing\AWS.Lambda.Powertools.Tracing.csproj" />
     </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/examples/BatchProcessing/src/HelloWorld/HelloWorld.csproj b/examples/BatchProcessing/src/HelloWorld/HelloWorld.csproj
index 234948cb8..fb7d9b6a6 100644
--- a/examples/BatchProcessing/src/HelloWorld/HelloWorld.csproj
+++ b/examples/BatchProcessing/src/HelloWorld/HelloWorld.csproj
@@ -7,11 +7,10 @@
     <ItemGroup>
         <PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
         <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
-<!--        <PackageReference Include="AWS.Lambda.Powertools.BatchProcessing" Version="3.0.0" />-->
-        <PackageReference Include="AWS.Lambda.Powertools.Logging" Version="3.0.0" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
     </ItemGroup>
     <ItemGroup>
-      <ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.BatchProcessing\AWS.Lambda.Powertools.BatchProcessing.csproj" />
+        <ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.BatchProcessing\AWS.Lambda.Powertools.BatchProcessing.csproj" />
+        <ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Logging\AWS.Lambda.Powertools.Logging.csproj" />
     </ItemGroup>
 </Project>
diff --git a/examples/Event Handler/BedrockAgentFunction/src/BedrockAgentFunction.csproj b/examples/Event Handler/BedrockAgentFunction/src/BedrockAgentFunction.csproj
index bcd2c51cd..5f945d9de 100644
--- a/examples/Event Handler/BedrockAgentFunction/src/BedrockAgentFunction.csproj	
+++ b/examples/Event Handler/BedrockAgentFunction/src/BedrockAgentFunction.csproj	
@@ -13,10 +13,12 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Amazon.Lambda.RuntimeSupport" Version="1.12.0" />
-    <PackageReference Include="Amazon.Lambda.Core" Version="2.5.0" />
+    <PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
     <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
-    <PackageReference Include="AWS.Lambda.Powertools.EventHandler.Resolvers.BedrockAgentFunction" Version="1.0.0-alpha.3" />
     <PackageReference Include="AWSSDK.GeoPlaces" Version="4.0.0.4" />
-    <PackageReference Include="AWS.Lambda.Powertools.Logging" Version="2.0.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\..\libraries\src\AWS.Lambda.Powertools.EventHandler.Resolvers.BedrockAgentFunction\AWS.Lambda.Powertools.EventHandler.Resolvers.BedrockAgentFunction.csproj" />
+    <ProjectReference Include="..\..\..\..\..\libraries\src\AWS.Lambda.Powertools.Logging\AWS.Lambda.Powertools.Logging.csproj" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/examples/Idempotency/src/HelloWorld/HelloWorld.csproj b/examples/Idempotency/src/HelloWorld/HelloWorld.csproj
index 2afa5a496..e5492bd8a 100644
--- a/examples/Idempotency/src/HelloWorld/HelloWorld.csproj
+++ b/examples/Idempotency/src/HelloWorld/HelloWorld.csproj
@@ -8,7 +8,9 @@
         <PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
         <PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.3" />
         <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
-        <PackageReference Include="AWS.Lambda.Powertools.Idempotency" Version="3.0.2" />
-        <PackageReference Include="AWS.Lambda.Powertools.Logging" Version="3.0.2" />
+    </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Idempotency\AWS.Lambda.Powertools.Idempotency.csproj" />
+        <ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Logging\AWS.Lambda.Powertools.Logging.csproj" />
     </ItemGroup>
 </Project>
diff --git a/examples/Kafka/Avro/src/Avro.csproj b/examples/Kafka/Avro/src/Avro.csproj
index 3ad9adbac..4795db70a 100644
--- a/examples/Kafka/Avro/src/Avro.csproj
+++ b/examples/Kafka/Avro/src/Avro.csproj
@@ -18,8 +18,10 @@
         <PackageReference Include="Amazon.Lambda.RuntimeSupport" Version="1.14.1" />
         <PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
         <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4"/>
-        <PackageReference Include="AWS.Lambda.Powertools.Logging" Version="3.0.2" />
-        <PackageReference Include="AWS.Lambda.Powertools.Kafka.Avro" Version="3.0.2" />
+    </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Logging\AWS.Lambda.Powertools.Logging.csproj" />
+        <ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Kafka.Avro\AWS.Lambda.Powertools.Kafka.Avro.csproj" />
     </ItemGroup>
     <Target Name="GenerateAvroClasses" BeforeTargets="CoreCompile">
         <Exec Command="avrogen -s $(ProjectDir)CustomerProfile.avsc $(ProjectDir)Generated"/>
diff --git a/examples/Kafka/Json/src/Json.csproj b/examples/Kafka/Json/src/Json.csproj
index c677f1497..f10cb9d2d 100644
--- a/examples/Kafka/Json/src/Json.csproj
+++ b/examples/Kafka/Json/src/Json.csproj
@@ -15,8 +15,10 @@
         <PackageReference Include="Amazon.Lambda.RuntimeSupport" Version="1.14.1" />
         <PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
         <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4"/>
-        <PackageReference Include="AWS.Lambda.Powertools.Logging" Version="3.0.2" />
-        <PackageReference Include="AWS.Lambda.Powertools.Kafka.Json" Version="3.0.2" />
+    </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Logging\AWS.Lambda.Powertools.Logging.csproj" />
+        <ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Kafka.Json\AWS.Lambda.Powertools.Kafka.Json.csproj" />
     </ItemGroup>
     <ItemGroup>
         <None Remove="kafka-json-event.json" />
diff --git a/examples/Kafka/JsonClassLibrary/src/ProtoBufClassLibrary.csproj b/examples/Kafka/JsonClassLibrary/src/ProtoBufClassLibrary.csproj
index 7c1e0e56a..58d9bc1ca 100644
--- a/examples/Kafka/JsonClassLibrary/src/ProtoBufClassLibrary.csproj
+++ b/examples/Kafka/JsonClassLibrary/src/ProtoBufClassLibrary.csproj
@@ -13,13 +13,15 @@
     <ItemGroup>
         <PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
         <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4"/>
-        <PackageReference Include="AWS.Lambda.Powertools.Logging" Version="3.0.2" />
-        <PackageReference Include="AWS.Lambda.Powertools.Kafka.Protobuf" Version="3.0.2" />
         <PackageReference Include="Grpc.Tools" Version="2.72.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
     </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Logging\AWS.Lambda.Powertools.Logging.csproj" />
+        <ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Kafka.Protobuf\AWS.Lambda.Powertools.Kafka.Protobuf.csproj" />
+    </ItemGroup>
     <ItemGroup>
         <Content Update="kafka-protobuf-event.json">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/examples/Kafka/Protobuf/src/Protobuf.csproj b/examples/Kafka/Protobuf/src/Protobuf.csproj
index d5a6647f5..f9dad2680 100644
--- a/examples/Kafka/Protobuf/src/Protobuf.csproj
+++ b/examples/Kafka/Protobuf/src/Protobuf.csproj
@@ -15,13 +15,15 @@
         <PackageReference Include="Amazon.Lambda.RuntimeSupport" Version="1.14.1" />
         <PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
         <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
-        <PackageReference Include="AWS.Lambda.Powertools.Logging" Version="3.0.2" />
-        <PackageReference Include="AWS.Lambda.Powertools.Kafka.Protobuf" Version="3.0.2" />
         <PackageReference Include="Grpc.Tools" Version="2.72.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
     </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Logging\AWS.Lambda.Powertools.Logging.csproj" />
+        <ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Kafka.Protobuf\AWS.Lambda.Powertools.Kafka.Protobuf.csproj" />
+    </ItemGroup>
     <ItemGroup>
       <Content Update="kafka-protobuf-event.json">
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/examples/Logging/src/HelloWorld/HelloWorld.csproj b/examples/Logging/src/HelloWorld/HelloWorld.csproj
index 4d6c65d10..6afc39861 100644
--- a/examples/Logging/src/HelloWorld/HelloWorld.csproj
+++ b/examples/Logging/src/HelloWorld/HelloWorld.csproj
@@ -8,7 +8,9 @@
         <PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
         <PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.3" />
         <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
-        <PackageReference Include="AWS.Lambda.Powertools.Logging" Version="3.0.2" />
         <PackageReference Include="AWSSDK.DynamoDBv2" Version="4.0.10.4" />
     </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Logging\AWS.Lambda.Powertools.Logging.csproj" />
+    </ItemGroup>
 </Project>
diff --git a/examples/Metrics/src/HelloWorld/HelloWorld.csproj b/examples/Metrics/src/HelloWorld/HelloWorld.csproj
index 4ce657943..ad283a004 100644
--- a/examples/Metrics/src/HelloWorld/HelloWorld.csproj
+++ b/examples/Metrics/src/HelloWorld/HelloWorld.csproj
@@ -8,8 +8,10 @@
         <PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
         <PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.3" />
         <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
-        <PackageReference Include="AWS.Lambda.Powertools.Logging" Version="3.0.2" />
-        <PackageReference Include="AWS.Lambda.Powertools.Metrics" Version="3.0.2" />
         <PackageReference Include="AWSSDK.DynamoDBv2" Version="4.0.10.4" />
     </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Logging\AWS.Lambda.Powertools.Logging.csproj" />
+        <ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Metrics\AWS.Lambda.Powertools.Metrics.csproj" />
+    </ItemGroup>
 </Project>
diff --git a/examples/Parameters/src/HelloWorld/HelloWorld.csproj b/examples/Parameters/src/HelloWorld/HelloWorld.csproj
index 0ef3f0092..92ef92e41 100644
--- a/examples/Parameters/src/HelloWorld/HelloWorld.csproj
+++ b/examples/Parameters/src/HelloWorld/HelloWorld.csproj
@@ -8,6 +8,8 @@
         <PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
         <PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.3" />
         <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
-        <PackageReference Include="AWS.Lambda.Powertools.Parameters" Version="3.0.2" />
+    </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Parameters\AWS.Lambda.Powertools.Parameters.csproj" />
     </ItemGroup>
 </Project>
diff --git a/examples/ServerlessApi/src/LambdaPowertoolsAPI/LambdaPowertoolsAPI.csproj b/examples/ServerlessApi/src/LambdaPowertoolsAPI/LambdaPowertoolsAPI.csproj
index 3849a51bf..841a878a1 100644
--- a/examples/ServerlessApi/src/LambdaPowertoolsAPI/LambdaPowertoolsAPI.csproj
+++ b/examples/ServerlessApi/src/LambdaPowertoolsAPI/LambdaPowertoolsAPI.csproj
@@ -13,8 +13,10 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Amazon.Lambda.AspNetCoreServer" Version="9.2.0" />
-    <PackageReference Include="AWS.Lambda.Powertools.Logging" Version="3.0.2" />
-    <PackageReference Include="AWS.Lambda.Powertools.Metrics" Version="3.0.2" />
-    <PackageReference Include="AWS.Lambda.Powertools.Tracing" Version="3.0.2" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Logging\AWS.Lambda.Powertools.Logging.csproj" />
+    <ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Metrics\AWS.Lambda.Powertools.Metrics.csproj" />
+    <ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Tracing\AWS.Lambda.Powertools.Tracing.csproj" />
   </ItemGroup>
 </Project>
diff --git a/examples/Tracing/src/HelloWorld/HelloWorld.csproj b/examples/Tracing/src/HelloWorld/HelloWorld.csproj
index f9da1ca34..93a81fa25 100644
--- a/examples/Tracing/src/HelloWorld/HelloWorld.csproj
+++ b/examples/Tracing/src/HelloWorld/HelloWorld.csproj
@@ -8,8 +8,10 @@
         <PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
         <PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.3" />
         <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
-        <PackageReference Include="AWS.Lambda.Powertools.Logging" Version="3.0.2" />
-        <PackageReference Include="AWS.Lambda.Powertools.Tracing" Version="3.0.2" />
         <PackageReference Include="AWSSDK.DynamoDBv2" Version="4.0.10.4" />
     </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Logging\AWS.Lambda.Powertools.Logging.csproj" />
+        <ProjectReference Include="..\..\..\..\libraries\src\AWS.Lambda.Powertools.Tracing\AWS.Lambda.Powertools.Tracing.csproj" />
+    </ItemGroup>
 </Project>