diff --git a/src/Couchbase.Extensions.DependencyInjection/Couchbase.Extensions.DependencyInjection.csproj b/src/Couchbase.Extensions.DependencyInjection/Couchbase.Extensions.DependencyInjection.csproj
index b838f16e6..f6f1f7f8a 100644
--- a/src/Couchbase.Extensions.DependencyInjection/Couchbase.Extensions.DependencyInjection.csproj
+++ b/src/Couchbase.Extensions.DependencyInjection/Couchbase.Extensions.DependencyInjection.csproj
@@ -25,6 +25,9 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
     <PackageReference Include="Microsoft.Extensions.Options" />
+  </ItemGroup>
+
+  <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">
     <PackageReference Include="System.Threading.Tasks.Dataflow" />
   </ItemGroup>
 
diff --git a/src/Couchbase.Extensions.OpenTelemetry/Couchbase.Extensions.OpenTelemetry.csproj b/src/Couchbase.Extensions.OpenTelemetry/Couchbase.Extensions.OpenTelemetry.csproj
index 85eb9ade9..3df4b4165 100644
--- a/src/Couchbase.Extensions.OpenTelemetry/Couchbase.Extensions.OpenTelemetry.csproj
+++ b/src/Couchbase.Extensions.OpenTelemetry/Couchbase.Extensions.OpenTelemetry.csproj
@@ -12,12 +12,7 @@
   <ItemGroup>
     <PackageReference Include="OpenTelemetry" />
     <PackageReference Include="OpenTelemetry.Api" />
-    <PackageReference Include="System.Threading.Tasks.Dataflow" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="System.Linq.AsyncEnumerable" Condition="'$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net10.0'"/>
-    <PackageReference Include="System.Linq.Async" Condition="'$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'netstandard2.1' "/>
+    <PackageReference Include="System.Linq.AsyncEnumerable"/>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Couchbase/Couchbase.csproj b/src/Couchbase/Couchbase.csproj
index 0508150ac..37d68c02f 100644
--- a/src/Couchbase/Couchbase.csproj
+++ b/src/Couchbase/Couchbase.csproj
@@ -58,7 +58,9 @@
     <PackageReference Include="Microsoft.Extensions.ObjectPool" />
     <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="Snappier" />
-    <PackageReference Include="System.IO.Pipelines" />
+  </ItemGroup>
+
+  <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">
     <PackageReference Include="System.Text.Json" />
     <PackageReference Include="System.Threading.Channels" />
     <PackageReference Include="System.Threading.Tasks.Dataflow" />
@@ -68,6 +70,10 @@
     <PackageReference Include="Microsoft.Bcl.TimeProvider" />
   </ItemGroup>
 
+  <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))">
+    <PackageReference Include="System.IO.Pipelines" />
+  </ItemGroup>
+
   <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
     <PackageReference Include="System.IO.Hashing" />
   </ItemGroup>