diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9a53d16dc..f937ee313b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,14 @@
 # Changelog
 All changes to the project will be documented in this file.
 
+## [1.37.16] - 2021-10-01
+*  Update included Build Tools to match .NET SDK 6 (PR: [#2239](https://github.com/OmniSharp/omnisharp-roslyn/pull/2239))
+* Add Custom .NET CLI support to OmniSharp (PR: [#2227](https://github.com/OmniSharp/omnisharp-roslyn/pull/2227))
+* Handle .editorconfig changes without running a new design time build ([#2112](https://github.com/OmniSharp/omnisharp-roslyn/issues/2112) PR: [#2234](https://github.com/OmniSharp/omnisharp-roslyn/pull/2234))
+* Do not return nulls when getting documents by path ([#2125](https://github.com/OmniSharp/omnisharp-roslyn/issues/2125) PR: [#2233](https://github.com/OmniSharp/omnisharp-roslyn/pull/2233))
+* handle RecordStructName in semantic highlighting classification ([#2228](https://github.com/OmniSharp/omnisharp-roslyn/issues/2228) PR: [#2232](https://github.com/OmniSharp/omnisharp-roslyn/pull/2232))
+* Update CodeStructureService with FileScoped Namespace support ([#2225](https://github.com/OmniSharp/omnisharp-roslyn/issues/2225) PR: [#2226](https://github.com/OmniSharp/omnisharp-roslyn/pull/2226))
+
 ## [1.37.15] - 2021-08-31
 * Update Roslyn to 4.0.0-4.21427.11 (PR: [#2220](https://github.com/OmniSharp/omnisharp-roslyn/pull/2220))
 * Update NuGet to 5.10.0 ([#2027](https://github.com/OmniSharp/omnisharp-roslyn/issues/2027), PR: [#2034](https://github.com/OmniSharp/omnisharp-roslyn/pull/2034))
diff --git a/build/Packages.props b/build/Packages.props
index 90dedf87fb..c9a0ae59c1 100644
--- a/build/Packages.props
+++ b/build/Packages.props
@@ -7,7 +7,7 @@
         <MicrosoftTestPackageVersion>16.9.4</MicrosoftTestPackageVersion>
         <MSBuildPackageVersion>16.10.0</MSBuildPackageVersion>
         <NuGetPackageVersion>5.10.0</NuGetPackageVersion>
-        <RoslynPackageVersion>4.0.0-4.21427.11</RoslynPackageVersion>
+        <RoslynPackageVersion>4.0.0-5.21480.15</RoslynPackageVersion>
         <XunitPackageVersion>2.4.1</XunitPackageVersion>
     </PropertyGroup>
 
diff --git a/tools/packages.config b/tools/packages.config
index 92b0c1e993..108f51d8a0 100644
--- a/tools/packages.config
+++ b/tools/packages.config
@@ -9,44 +9,44 @@
     <!--
         The version for these packages can be found in the dotnet/installer eng/Versions.props file in
         the branch that corresponds with the SDK Toolset being modeled.
-        ex. https://github.com/dotnet/installer/blob/release/6.0.1xx-rc1/eng/Versions.props
+        ex. https://github.com/dotnet/installer/blob/release/6.0.1xx/eng/Versions.props
     -->
 
     <!-- These packages should match the "MicrosoftNETSdkPackageVersion" property-->
-    <package id="Microsoft.NET.Sdk" version="6.0.100-rc.1.21427.66" />
-    <package id="Microsoft.DotNet.MSBuildSdkResolver" version="6.0.100-rc.1.21427.66" />
+    <package id="Microsoft.NET.Sdk" version="6.0.100-rtm.21480.28" />
+    <package id="Microsoft.DotNet.MSBuildSdkResolver" version="6.0.100-rtm.21480.28" />
 
     <!-- These packages should match the "MicrosoftNETCoreDotNetHostResolverPackageVersion" property -->
-    <package id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-rc.1.21426.17" />
-    <package id="runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-rc.1.21426.17" />
-    <package id="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-rc.1.21426.17" />
-    <package id="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-rc.1.21426.17" />
-    <package id="runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-rc.1.21426.17" />
+    <package id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-rtm.21479.7" />
+    <package id="runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-rtm.21479.7" />
+    <package id="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-rtm.21479.7" />
+    <package id="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-rtm.21479.7" />
+    <package id="runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-rtm.21479.7" />
 
     <!--
         The version for these packages can be found in the dotnet/sdk eng/Versions.props file in
         the branch that corresponds with the "Microsoft.NET.Sdk package" being referenced.
-        ex. https://github.com/dotnet/sdk/blob/release/6.0.1xx-rc1/eng/Versions.props
+        ex. https://github.com/dotnet/sdk/blob/release/6.0.1xx/eng/Versions.props
     -->
 
     <!-- These packages should match the "MicrosoftBuildPackageVersion" property -->
-    <package id="Microsoft.Build" version="17.0.0-preview-21426-01" />
-    <package id="Microsoft.Build.Framework" version="17.0.0-preview-21426-01" />
-    <package id="Microsoft.Build.Runtime" version="17.0.0-preview-21426-01" />
-    <package id="Microsoft.Build.Tasks.Core" version="17.0.0-preview-21426-01" />
-    <package id="Microsoft.Build.Utilities.Core" version="17.0.0-preview-21426-01" />
+    <package id="Microsoft.Build" version="17.0.0-preview-21480-03" />
+    <package id="Microsoft.Build.Framework" version="17.0.0-preview-21480-03" />
+    <package id="Microsoft.Build.Runtime" version="17.0.0-preview-21480-03" />
+    <package id="Microsoft.Build.Tasks.Core" version="17.0.0-preview-21480-03" />
+    <package id="Microsoft.Build.Utilities.Core" version="17.0.0-preview-21480-03" />
     <!-- This package should match as well except the Major & Minor version are set to 1.0 -->
-    <package id="Microsoft.NET.StringTools" version="1.0.0-preview-21426-01" />
+    <package id="Microsoft.NET.StringTools" version="1.0.0-preview-21480-03" />
 
     <!-- This package should match the "MicrosoftNetCompilersToolsetPackageVersion" property-->
-    <package id="Microsoft.Net.Compilers.Toolset" version="4.0.0-4.21427.11" />
+    <package id="Microsoft.Net.Compilers.Toolset" version="4.0.0-5.21480.15" />
 
     <!-- These packages should match the "NuGetBuildTasksPackageVersion" property -->
-    <package id="Microsoft.Build.NuGetSdkResolver" version="6.0.0-preview.4.230" />
-    <package id="NuGet.Build.Tasks" version="6.0.0-preview.4.230" />
-    <package id="NuGet.Commands" version="6.0.0-preview.4.230" />
-    <package id="NuGet.Credentials" version="6.0.0-preview.4.230" />
-    <package id="NuGet.Frameworks" version="6.0.0-preview.4.230" />
+    <package id="Microsoft.Build.NuGetSdkResolver" version="6.0.0-rc.258" />
+    <package id="NuGet.Build.Tasks" version="6.0.0-rc.258" />
+    <package id="NuGet.Commands" version="6.0.0-rc.258" />
+    <package id="NuGet.Credentials" version="6.0.0-rc.258" />
+    <package id="NuGet.Frameworks" version="6.0.0-rc.258" />
 
     <!-- This package should match the "NewtonsoftJsonPackageVersion" property-->
     <package id="Newtonsoft.Json" version="13.0.1" />