diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index ca5cb9b26..0271ff08b 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -12,11 +12,11 @@
 
 ## Checklist
 
-If your change doesn't seem to apply, please leave them unchecked.
+Please leave checklist items unchecked if they do not apply to your change.
 
-* [ ] [Meet tenets criteria](https://awslabs.github.io/aws-lambda-powertools-python/#tenets)
-* [ ] I have performed a self-review of my this change
-* [ ] Changes are tested
+* [ ] [Meets tenets criteria](https://awslabs.github.io/aws-lambda-powertools-python/#tenets)
+* [ ] I have performed a self-review of this change
+* [ ] Changes have been tested
 * [ ] Changes are documented
 * [ ] PR title follows [conventional commit semantics](https://github.com/awslabs/aws-lambda-powertools-dotnet/blob/develop/.github/semantic.yml)
 
diff --git a/buildtools/NuGet.Config b/buildtools/NuGet.Config
deleted file mode 100644
index 7ca4b2b80..000000000
--- a/buildtools/NuGet.Config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?> <configuration>
-	<packageSources>
-		<add key="build-artifacts" value="./nuget-packages" />
-	</packageSources>
-</configuration>
\ No newline at end of file
diff --git a/buildtools/build.proj b/buildtools/build.proj
deleted file mode 100644
index 1692e6cd8..000000000
--- a/buildtools/build.proj
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="full-build" 
-    xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <ItemGroup>
-        <DeploymentNuGetConfig Include="NuGet.Config"/>
-    </ItemGroup>
-
-    <PropertyGroup>
-        <Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
-        <PackCommand>dotnet pack --no-build -c $(Configuration) -o "$(MSBuildThisFileDirectory)/../deploy/nuget-packages"</PackCommand>
-		<PackWithConfigurationCommand>dotnet pack --no-build -o "$(MSBuildThisFileDirectory)/../deploy/nuget-packages"</PackWithConfigurationCommand>
-        <Cicd Condition="'$(Cicd)' == ''">false</Cicd>
-    </PropertyGroup>
-
-    <Target Name="full-build" DependsOnTargets="full-build-notests;run-tests;"></Target>
-    <Target Name="full-build-notests" DependsOnTargets="build-nuget-packages;"></Target>
-    <Target Name="tests" DependsOnTargets="unit-tests"></Target>
-    <Target Name="unit-tests" DependsOnTargets="run-unit-tests"></Target>
-    <Target Name="build" DependsOnTargets="build-project-packages;run-blueprint-packager;build-lambda-test-tool-package-cicd"></Target>
-
-    <ItemGroup>
-        <LibraryName Include="..\libraries\src\**\*.csproj"/>
-    </ItemGroup>
-
-    <Target Name="init" Condition="!$(Cicd)">
-        <RemoveDir Directories="../deploy"/>
-        <MakeDir Directories="../deploy/nuget-packages"/>
-        <Exec Command="dotnet restore AWS.Lambda.Powertools.sln" WorkingDirectory="..\libraries"/>
-    </Target>
-
-    <Target Name="run-tests" DependsOnTargets="build-nuget-packages">
-        <PropertyGroup>
-            <Command>dotnet test -c $(Configuration)</Command>
-        </PropertyGroup>
-        <Exec Command="$(Command) AWS.Lambda.Powertools.sln" WorkingDirectory="..\libraries"/>
-    </Target>
-
-    <Target Name="build-nuget-packages" DependsOnTargets="init">
-        <Exec Command="dotnet msbuild AWS.Lambda.Powertools.sln /t:Rebuild /p:Configuration=$(Configuration) /p:AssemblyOriginatorKeyFile=$(AssemblyOriginatorKeyFile) /p:SignAssembly=$(SignAssembly)" WorkingDirectory="..\libraries"/>
-        <Exec Command="$(PackCommand)" WorkingDirectory="..\libraries\src\%(LibraryName.FileName)"/>
-    </Target>
-
-    <Target Name="build-project-packages">
-        <Exec Command="dotnet msbuild -restore /p:Configuration=$(Configuration) /p:AssemblyOriginatorKeyFile=$(AssemblyOriginatorKeyFile) /p:SignAssembly=$(SignAssembly)" WorkingDirectory="..\libraries\src\%(LibraryName.FileName)"/>
-    </Target>
-    
-    <Target Name="run-unit-tests">
-        <Exec Command="dotnet test -c $(Configuration)" WorkingDirectory="..\libraries\test\Amazon.Lambda.RuntimeSupport.Tests\Amazon.Lambda.RuntimeSupport.UnitTests"/>
-    </Target>
-    
-    <Target Name="create-nuget-packages-cicd" DependsOnTargets="build-project-packages">
-        <Exec Command="$(PackCommand)" WorkingDirectory="..\libraries\src\%(LibraryName.FileName)"/>
-    </Target>
-</Project>
\ No newline at end of file
diff --git a/buildtools/common.props b/buildtools/common.props
deleted file mode 100644
index 8b94a290b..000000000
--- a/buildtools/common.props
+++ /dev/null
@@ -1,25 +0,0 @@
-<Project>
-
-  <PropertyGroup>
-    <Authors>Amazon Web Services</Authors>
-
-    <OutputType>Library</OutputType>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-	
-    <Copyright>Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.</Copyright>
-    <RepositoryUrl>https://github.com/awslabs/aws-lambda-powertools-dotnet</RepositoryUrl>
-    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
-
-
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-	
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/buildtools/nuget.exe b/buildtools/nuget.exe
deleted file mode 100644
index 1a67d80c9..000000000
Binary files a/buildtools/nuget.exe and /dev/null differ
diff --git a/libraries/tests/AWS.Lambda.Powertools.Common.Tests/AWS.Lambda.Powertools.Common.Tests.csproj b/libraries/tests/AWS.Lambda.Powertools.Common.Tests/AWS.Lambda.Powertools.Common.Tests.csproj
index 995619dee..e6ffda997 100644
--- a/libraries/tests/AWS.Lambda.Powertools.Common.Tests/AWS.Lambda.Powertools.Common.Tests.csproj
+++ b/libraries/tests/AWS.Lambda.Powertools.Common.Tests/AWS.Lambda.Powertools.Common.Tests.csproj
@@ -7,6 +7,10 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <PackageReference Include="coverlet.collector" Version="3.1.2">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
         <PackageReference Include="Moq" Version="4.18.1" />
         <PackageReference Include="xunit" Version="2.4.1" />
diff --git a/libraries/tests/AWS.Lambda.Powertools.Logging.Tests/AWS.Lambda.Powertools.Logging.Tests.csproj b/libraries/tests/AWS.Lambda.Powertools.Logging.Tests/AWS.Lambda.Powertools.Logging.Tests.csproj
index 162576dfa..4d82051d2 100644
--- a/libraries/tests/AWS.Lambda.Powertools.Logging.Tests/AWS.Lambda.Powertools.Logging.Tests.csproj
+++ b/libraries/tests/AWS.Lambda.Powertools.Logging.Tests/AWS.Lambda.Powertools.Logging.Tests.csproj
@@ -10,6 +10,10 @@
     <ItemGroup>
         <PackageReference Include="Amazon.Lambda.ApplicationLoadBalancerEvents" Version="2.1.0" />
         <PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.5.0" />
+        <PackageReference Include="coverlet.collector" Version="3.1.2">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
         <PackageReference Include="Moq" Version="4.18.1" />
         <PackageReference Include="xunit" Version="2.4.1" />
diff --git a/libraries/tests/AWS.Lambda.Powertools.Tracing.Tests/AWS.Lambda.Powertools.Tracing.Tests.csproj b/libraries/tests/AWS.Lambda.Powertools.Tracing.Tests/AWS.Lambda.Powertools.Tracing.Tests.csproj
index fb761c00b..88daa30f3 100644
--- a/libraries/tests/AWS.Lambda.Powertools.Tracing.Tests/AWS.Lambda.Powertools.Tracing.Tests.csproj
+++ b/libraries/tests/AWS.Lambda.Powertools.Tracing.Tests/AWS.Lambda.Powertools.Tracing.Tests.csproj
@@ -13,6 +13,10 @@
     </ItemGroup>
 
     <ItemGroup>
+        <PackageReference Include="coverlet.collector" Version="3.1.2">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
         <PackageReference Include="Moq" Version="4.18.1" />
         <PackageReference Include="xunit" Version="2.4.1" />