diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18de9544..28f42cc4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,6 @@ Please ADD ALL Changes to the UNRELEASED SECTION and not a specific release
 - Dependencies - Updated FunFair.Test.Common to 6.1.1.49
 - Dependencies - Updated Microsoft.Extensions to 7.0.1
 - Dependencies - Updated Polly to 7.2.4
-- SDK - Updated DotNet SDK to 8.0.100-preview.7.23376.3
 - Dependencies - Updated Microsoft.CodeAnalysis.CSharp to 4.7.0
 - Dependencies - Updated Microsoft.VisualStudio.Threading.Analyzers to 17.7.30
 - Dependencies - Updated xunit.analyzers to 1.2.0
@@ -29,6 +28,7 @@ Please ADD ALL Changes to the UNRELEASED SECTION and not a specific release
 - Dependencies - Updated Meziantou.Analyzer to 2.0.84
 - Dependencies - Updated NSubstitute to 5.1.0
 - Dependencies - Updated Credfeto.Enumeration.Source.Generation to 1.1.0.138
+- SDK - Updated DotNet SDK to 8.0.100-rc.1.23455.8
 ### Removed
 ### Deployment Changes
 
diff --git a/src/Credfeto.Database.Interfaces/Credfeto.Database.Interfaces.csproj b/src/Credfeto.Database.Interfaces/Credfeto.Database.Interfaces.csproj
index d15056b0..98ec9981 100644
--- a/src/Credfeto.Database.Interfaces/Credfeto.Database.Interfaces.csproj
+++ b/src/Credfeto.Database.Interfaces/Credfeto.Database.Interfaces.csproj
@@ -14,7 +14,7 @@
     <IncludeSymbols>true</IncludeSymbols>
     <IsPackable>true</IsPackable>
     <IsPublishable>false</IsPublishable>
-    <IsTrimmable>true</IsTrimmable>
+    <IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">true</IsTrimmable>
     <JsonSerializerIsReflectionEnabledByDefault>false</JsonSerializerIsReflectionEnabledByDefault>
     <LangVersion>latest</LangVersion>
     <NoWarn />
diff --git a/src/Credfeto.Database.Pgsql/Credfeto.Database.Pgsql.csproj b/src/Credfeto.Database.Pgsql/Credfeto.Database.Pgsql.csproj
index b17cb766..7ac3aa16 100644
--- a/src/Credfeto.Database.Pgsql/Credfeto.Database.Pgsql.csproj
+++ b/src/Credfeto.Database.Pgsql/Credfeto.Database.Pgsql.csproj
@@ -14,7 +14,7 @@
     <IncludeSymbols>true</IncludeSymbols>
     <IsPackable>true</IsPackable>
     <IsPublishable>false</IsPublishable>
-    <IsTrimmable>true</IsTrimmable>
+    <IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">true</IsTrimmable>
     <JsonSerializerIsReflectionEnabledByDefault>false</JsonSerializerIsReflectionEnabledByDefault>
     <LangVersion>latest</LangVersion>
     <NoWarn />
diff --git a/src/Credfeto.Database.Source.Generation.Example.Tests.Integration/Credfeto.Database.Source.Generation.Example.Tests.Integration.csproj b/src/Credfeto.Database.Source.Generation.Example.Tests.Integration/Credfeto.Database.Source.Generation.Example.Tests.Integration.csproj
index 8659241a..0e763f64 100644
--- a/src/Credfeto.Database.Source.Generation.Example.Tests.Integration/Credfeto.Database.Source.Generation.Example.Tests.Integration.csproj
+++ b/src/Credfeto.Database.Source.Generation.Example.Tests.Integration/Credfeto.Database.Source.Generation.Example.Tests.Integration.csproj
@@ -12,7 +12,7 @@
     <IncludeOpenAPIAnalyzers>true</IncludeOpenAPIAnalyzers>
     <IsPackable>false</IsPackable>
     <IsPublishable>false</IsPublishable>
-    <IsTrimmable>true</IsTrimmable>
+    <IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">true</IsTrimmable>
     <JsonSerializerIsReflectionEnabledByDefault>false</JsonSerializerIsReflectionEnabledByDefault>
     <LangVersion>latest</LangVersion>
     <NoWarn />
diff --git a/src/Credfeto.Database.Source.Generation.Example/Credfeto.Database.Source.Generation.Example.csproj b/src/Credfeto.Database.Source.Generation.Example/Credfeto.Database.Source.Generation.Example.csproj
index d5ebece2..731e63ed 100644
--- a/src/Credfeto.Database.Source.Generation.Example/Credfeto.Database.Source.Generation.Example.csproj
+++ b/src/Credfeto.Database.Source.Generation.Example/Credfeto.Database.Source.Generation.Example.csproj
@@ -13,7 +13,7 @@
     <IncludeOpenAPIAnalyzers>true</IncludeOpenAPIAnalyzers>
     <IsPackable>false</IsPackable>
     <IsPublishable>false</IsPublishable>
-    <IsTrimmable>true</IsTrimmable>
+    <IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">true</IsTrimmable>
     <JsonSerializerIsReflectionEnabledByDefault>false</JsonSerializerIsReflectionEnabledByDefault>
     <LangVersion>latest</LangVersion>
     <NoWarn />
diff --git a/src/Credfeto.Database.SqlServer/Credfeto.Database.SqlServer.csproj b/src/Credfeto.Database.SqlServer/Credfeto.Database.SqlServer.csproj
index 7a8b2c86..065ec210 100644
--- a/src/Credfeto.Database.SqlServer/Credfeto.Database.SqlServer.csproj
+++ b/src/Credfeto.Database.SqlServer/Credfeto.Database.SqlServer.csproj
@@ -14,7 +14,7 @@
     <IncludeSymbols>true</IncludeSymbols>
     <IsPackable>true</IsPackable>
     <IsPublishable>false</IsPublishable>
-    <IsTrimmable>true</IsTrimmable>
+    <IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">true</IsTrimmable>
     <JsonSerializerIsReflectionEnabledByDefault>false</JsonSerializerIsReflectionEnabledByDefault>
     <LangVersion>latest</LangVersion>
     <NoWarn />
diff --git a/src/Credfeto.Database/Credfeto.Database.csproj b/src/Credfeto.Database/Credfeto.Database.csproj
index 28e6ae7d..9a5d3340 100644
--- a/src/Credfeto.Database/Credfeto.Database.csproj
+++ b/src/Credfeto.Database/Credfeto.Database.csproj
@@ -14,7 +14,7 @@
     <IncludeSymbols>true</IncludeSymbols>
     <IsPackable>true</IsPackable>
     <IsPublishable>false</IsPublishable>
-    <IsTrimmable>true</IsTrimmable>
+    <IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">true</IsTrimmable>
     <JsonSerializerIsReflectionEnabledByDefault>false</JsonSerializerIsReflectionEnabledByDefault>
     <LangVersion>latest</LangVersion>
     <NoWarn />