diff --git a/Directory.Build.props b/Directory.Build.props
index 505d8ef..e1be1f4 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -11,31 +11,44 @@
             StrongOf helps to implement primitives as a strong type that represents a domain object (e.g. UserId, EmailAddress, etc.). It is a simple class that wraps a value and provides a few helper methods to make it easier to work with.
             In contrast to other approaches, StrongOf is above all simple and performant - and not over-engineered.
         </Description>
+        <DefaultLanguage>en-US</DefaultLanguage>
+        <NoPackageAnalysis>true</NoPackageAnalysis>
+        <DebugType>embedded</DebugType>
     </PropertyGroup>
 
-    <!-- Assembly -->
-    <PropertyGroup>
+    <PropertyGroup Label="Env">
+        <IsTestProject>$(MSBuildProjectName.Contains('Test'))</IsTestProject>
+        <IsBenchmarkProject>$(MsBuildProjectName.Contains('Benchmark'))</IsBenchmarkProject>
+    </PropertyGroup>
+
+    <PropertyGroup Label="Assembly">
         <GlobalNamespacePrefix>StrongOf</GlobalNamespacePrefix>
         <GlobalAssemblyNamePrefix>BenjaminAbt.StrongOf</GlobalAssemblyNamePrefix>
     </PropertyGroup>
 
-    <!-- Project Defaults -->
-    <PropertyGroup>
+    <PropertyGroup Label="Project Defaults">
         <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
     </PropertyGroup>
 
-    <!-- Package -->
-    <PropertyGroup>
+    <PropertyGroup Label="Package">
         <IsPackable>false</IsPackable>
         <PackageProjectUrl>https://github.com/BenjaminAbt/StrongOf</PackageProjectUrl>
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <Description>Primitive Obsession with .NET</Description>
+        <MinClientVersion>2.12</MinClientVersion>
         <PackageTags>Strong, StrongOf, DDD, Value Objects, Domain Driven Design</PackageTags>
+        <IsPackable>false</IsPackable>
+        <EmbedUntrackedSources>true</EmbedUntrackedSources>
     </PropertyGroup>
 
-    <!-- C# -->
-    <PropertyGroup>
+    <PropertyGroup Label="C#">
         <LangVersion>12.0</LangVersion>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     </PropertyGroup>
+
+    <PropertyGroup Condition="'$(IsTestProject)' != 'true' AND '$(IsBenchmarkProject)' != 'true'">
+        <GenerateDocumentationFile Condition="'$(Configuration)' == 'Release'">true</GenerateDocumentationFile>
+    </PropertyGroup>
 </Project>
diff --git a/src/StrongOf.AspNetCore/StrongOf.AspNetCore.csproj b/src/StrongOf.AspNetCore/StrongOf.AspNetCore.csproj
index fa023f8..f9cf339 100644
--- a/src/StrongOf.AspNetCore/StrongOf.AspNetCore.csproj
+++ b/src/StrongOf.AspNetCore/StrongOf.AspNetCore.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <!-- Package -->
-    <PropertyGroup>
+    <PropertyGroup Label="Package">
         <IsPackable>true</IsPackable>
         <PackageReadmeFile>readme.md</PackageReadmeFile>
         <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
diff --git a/src/StrongOf.FluentValidation/StrongOf.FluentValidation.csproj b/src/StrongOf.FluentValidation/StrongOf.FluentValidation.csproj
index ac1f44a..fe168c4 100644
--- a/src/StrongOf.FluentValidation/StrongOf.FluentValidation.csproj
+++ b/src/StrongOf.FluentValidation/StrongOf.FluentValidation.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <!-- Package -->
-    <PropertyGroup>
+    <PropertyGroup Label="Package">
         <IsPackable>true</IsPackable>
         <PackageReadmeFile>readme.md</PackageReadmeFile>
         <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
diff --git a/src/StrongOf.Json/StrongOf.Json.csproj b/src/StrongOf.Json/StrongOf.Json.csproj
index 9fbac99..7be2ecb 100644
--- a/src/StrongOf.Json/StrongOf.Json.csproj
+++ b/src/StrongOf.Json/StrongOf.Json.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <!-- Package -->
-    <PropertyGroup>
+    <PropertyGroup Label="Package">
         <IsPackable>true</IsPackable>
         <PackageReadmeFile>readme.md</PackageReadmeFile>
         <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
@@ -17,6 +16,6 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\StrongOf\StrongOf.csproj" />
+        <ProjectReference Include="..\StrongOf\StrongOf.csproj" />
     </ItemGroup>
 </Project>
diff --git a/src/StrongOf/StrongOf.csproj b/src/StrongOf/StrongOf.csproj
index e794523..f13cfe7 100644
--- a/src/StrongOf/StrongOf.csproj
+++ b/src/StrongOf/StrongOf.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <!-- Package -->
-    <PropertyGroup>
+    <PropertyGroup Label="Package">
         <IsPackable>true</IsPackable>
         <PackageReadmeFile>readme.md</PackageReadmeFile>
         <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>