diff --git a/src/SourceBuild/content/repo-projects/dotnet.proj b/src/SourceBuild/content/repo-projects/dotnet.proj
index bca5010dc..f3b4b1807 100644
--- a/src/SourceBuild/content/repo-projects/dotnet.proj
+++ b/src/SourceBuild/content/repo-projects/dotnet.proj
@@ -32,8 +32,7 @@
     <RepositoryReference Include="roslyn-analyzers" />
     <RepositoryReference Include="aspnetcore" />
     <RepositoryReference Include="deployment-tools" />
-    <!-- TODO: Reenable once format targets net8.0 (https://github.com/dotnet/format/issues/1802) -->
-    <!-- <RepositoryReference Include="format" /> -->
+    <RepositoryReference Include="format" />
     <RepositoryReference Include="nuget-client" />
     <RepositoryReference Include="templating" />
     <RepositoryReference Include="test-templates" />
diff --git a/src/SourceBuild/content/repo-projects/sdk.proj b/src/SourceBuild/content/repo-projects/sdk.proj
index e5d60dd8c..050dabf28 100644
--- a/src/SourceBuild/content/repo-projects/sdk.proj
+++ b/src/SourceBuild/content/repo-projects/sdk.proj
@@ -26,8 +26,7 @@
     <RepositoryReference Include="roslyn-analyzers" />
     <RepositoryReference Include="vstest" />
     <RepositoryReference Include="fsharp" />
-    <!-- TODO: Reenable once format targets net8.0 (https://github.com/dotnet/format/issues/1802) -->
-    <!-- <RepositoryReference Include="format" /> -->
+    <RepositoryReference Include="format" />
     <RepositoryReference Include="deployment-tools" />
     <RepositoryReference Include="razor" />
   </ItemGroup>
diff --git a/src/SourceBuild/patches/format/0001-Use-MicrosoftNetCompilersToolsetVersion-instead-of.patch b/src/SourceBuild/patches/format/0001-Use-MicrosoftNetCompilersToolsetVersion-instead-of.patch
new file mode 100644
index 000000000..4b35b4adc
--- /dev/null
+++ b/src/SourceBuild/patches/format/0001-Use-MicrosoftNetCompilersToolsetVersion-instead-of.patch
@@ -0,0 +1,61 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Michael Simons <msimons@microsoft.com>
+Date: Fri, 21 Apr 2023 03:07:28 +0000
+Subject: [PATCH] Use MicrosoftNetCompilersToolsetVersion instead of 
+ MicrosoftNetCompilersToolsetPackageVersion
+
+Temporary fix for https://github.com/dotnet/source-build/issues/3392
+---
+ Directory.Packages.props | 16 ++++++++--------
+ eng/Versions.props       |  4 ++--
+ 2 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/Directory.Packages.props b/Directory.Packages.props
+index c9041493..83f3d877 100644
+--- a/Directory.Packages.props
++++ b/Directory.Packages.props
+@@ -13,14 +13,14 @@
+     <PackageVersion Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorVersion)" />
+     <PackageVersion Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)"/>
+     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzer.Testing" Version="$(MicrosoftCodeAnalysisAnalzerTestingVersion)" />
+-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" />
+-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" />
+-    <PackageVersion Include="Microsoft.CodeAnalysis.Features" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" />
+-    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Features" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" />
+-    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" />
+-    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" />
+-    <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" />
+-    <PackageVersion Include="Microsoft.CodeAnalysis" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" />
++    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(MicrosoftNetCompilersToolsetVersion)" />
++    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftNetCompilersToolsetVersion)" />
++    <PackageVersion Include="Microsoft.CodeAnalysis.Features" Version="$(MicrosoftNetCompilersToolsetVersion)" />
++    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Features" Version="$(MicrosoftNetCompilersToolsetVersion)" />
++    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="$(MicrosoftNetCompilersToolsetVersion)" />
++    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="$(MicrosoftNetCompilersToolsetVersion)" />
++    <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(MicrosoftNetCompilersToolsetVersion)" />
++    <PackageVersion Include="Microsoft.CodeAnalysis" Version="$(MicrosoftNetCompilersToolsetVersion)" />
+     <PackageVersion Include="Microsoft.DiaSymReader" Version="$(MicrosoftDiaSymReaderVersion)" />
+     <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingVersion)" />
+     <PackageVersion Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" />
+diff --git a/eng/Versions.props b/eng/Versions.props
+index 2d325ec6..e1bc7022 100644
+--- a/eng/Versions.props
++++ b/eng/Versions.props
+@@ -21,7 +21,7 @@
+     <MicrosoftCodeAnalysisAnalyzersVersion>3.3.4</MicrosoftCodeAnalysisAnalyzersVersion>
+     <MicrosoftExtensionsDependencyInjectionVersion>7.0.0-rc.1.22426.10</MicrosoftExtensionsDependencyInjectionVersion>
+     <!-- Dependencies from https://github.com/dotnet/roslyn -->
+-    <MicrosoftNetCompilersToolsetPackageVersion>4.5.0-3.22602.7</MicrosoftNetCompilersToolsetPackageVersion>
++    <MicrosoftNetCompilersToolsetVersion>4.5.0-3.22602.7</MicrosoftNetCompilersToolsetVersion>
+     <!-- Dependencies from https://github.com/dotnet/command-line-api -->
+     <SystemCommandLineVersion>2.0.0-beta4.22564.1</SystemCommandLineVersion>
+     <SystemCommandLineRenderingVersion>0.4.0-alpha.22564.1</SystemCommandLineRenderingVersion>
+@@ -35,7 +35,7 @@
+     <!-- In order tests against the same version of NuGet as the SDK. We have to set this to match. -->
+     <NuGetVersion>6.6.0-preview.3.61</NuGetVersion>
+     <!-- roslyn -->
+-    <MicrosoftNetCompilersToolsetPackageVersion>4.5.0-3.22602.7</MicrosoftNetCompilersToolsetPackageVersion>
++    <MicrosoftNetCompilersToolsetVersion>4.5.0-3.22602.7</MicrosoftNetCompilersToolsetVersion>
+     <!-- roslyn-sdk -->
+     <MicrosoftCodeAnalysisAnalzerTestingVersion>1.1.2-beta1.22216.1</MicrosoftCodeAnalysisAnalzerTestingVersion>
+     <!-- runtime -->