diff --git a/Directory.Build.props b/Directory.Build.props
index 99afc96482..0fdffbe162 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -5,11 +5,8 @@
         <AssemblyName>Backbone.$(MSBuildProjectName)</AssemblyName>
         <RootNamespace>$(AssemblyName.Replace(" ", "_"))</RootNamespace>
         <Nullable>enable</Nullable>
-        <WarningsAsErrors>
-            CS8597,CS8600,CS8601,CS8602,CS8603,CS8604,CS8605,CS8607,CS8608,CS8609,CS8610,CS8611,CS8612,CS8613,CS8614,CS8615,
-            CS8616,CS8617,CS8618,CS8619,CS8620,CS8621,CS8622,CS8624,CS8625,CS8629,CS8631,CS8633,CS8634,CS8643,CS8644,CS8645,
-            CS8655,CS8667,CS8670,CS8714,CS8762,CS8763,CS8764,CS8765,CS8766,CS8767,CS8768,CS8769,CS8770,CS8774,CS8776,CS8775,
-            CS8777,CS8819,CS8824,CS8825,CS8847
-        </WarningsAsErrors>
+        <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+        <OptimizeImplicitlyTriggeredBuild>True</OptimizeImplicitlyTriggeredBuild>
+        <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     </PropertyGroup>
 </Project>
diff --git a/Modules/Directory.Build.props b/Modules/Directory.Build.props
index c80d150f68..0e06ab28b7 100644
--- a/Modules/Directory.Build.props
+++ b/Modules/Directory.Build.props
@@ -5,17 +5,14 @@
         <AssemblyName>Backbone.Modules.$(MSBuildProjectName)</AssemblyName>
         <RootNamespace>$(AssemblyName.Replace(" ", "_"))</RootNamespace>
         <Nullable>enable</Nullable>
-        <WarningsAsErrors>
-            CS8597,CS8600,CS8601,CS8602,CS8603,CS8604,CS8605,CS8607,CS8608,CS8609,CS8610,CS8611,CS8612,CS8613,CS8614,CS8615,
-            CS8616,CS8617,CS8618,CS8619,CS8620,CS8621,CS8622,CS8624,CS8625,CS8629,CS8631,CS8633,CS8634,CS8643,CS8644,CS8645,
-            CS8655,CS8667,CS8670,CS8714,CS8762,CS8763,CS8764,CS8765,CS8766,CS8767,CS8768,CS8769,CS8770,CS8774,CS8776,CS8775,
-            CS8777,CS8819,CS8824,CS8825,CS8847
-        </WarningsAsErrors>
+        <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+        <OptimizeImplicitlyTriggeredBuild>True</OptimizeImplicitlyTriggeredBuild>
+        <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     </PropertyGroup>
 
     <!-- Relationships Module is currently the only one with its respective unit tests next to the production (within the same project, as opposed to on a separate one) -->
     <ItemGroup Condition="'$(Configuration)' != 'Release' And $(MSBuildProjectFile.Contains('Relationships'))">
-        <ProjectReference Include="..\..\..\..\BuildingBlocks\src\UnitTestTools\UnitTestTools.csproj" />
+        <ProjectReference Include="..\..\..\..\BuildingBlocks\src\UnitTestTools\UnitTestTools.csproj"/>
     </ItemGroup>
 
     <ItemGroup Condition="'$(Configuration)' != 'Release' And $(MSBuildProjectFile.Contains('Relationships'))">
@@ -23,11 +20,11 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1"/>
         <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
     </ItemGroup>
-    
+
 </Project>