diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 458b625..3120d74 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,6 +1,6 @@
 name: Visual Studio Project Templates
 env:
-  TEMPLATE_VERSION: 3.8.5
+  TEMPLATE_VERSION: 3.8.6
 
 on:
   push:
diff --git a/CSharp/MonoGame.Templates.CSharp.csproj b/CSharp/MonoGame.Templates.CSharp.csproj
index 00e6501..7d91f2b 100644
--- a/CSharp/MonoGame.Templates.CSharp.csproj
+++ b/CSharp/MonoGame.Templates.CSharp.csproj
@@ -12,6 +12,10 @@
     <NoWarn>NU5128</NoWarn>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <MonoGameVersion Condition="'$(MonoGameVersion)' == ''">$(Version)</MonoGameVersion>
+  </PropertyGroup>
+
   <ItemGroup>
     <Content Include="content\**\*" Exclude="content\**\.DS_Store;content\**\bin;content\**\obj" />
     <Compile Remove="**\*" />
@@ -26,9 +30,24 @@
 
   <Target Name="SetMGPackageReferenceVersions" BeforeTargets="CoreBuild">
     <ItemGroup>
-      <MGProjects Include="**\*.csproj" />
+      <MGProjects Include="content\**\*.csproj" />
     </ItemGroup>
 
+    <XmlPoke
+      XmlInputPath="%(MGProjects.Identity)"
+      Query="/Project/ItemGroup/PackageReference[starts-with(@Include, 'MonoGame.Framework')]/@Version"
+      Value="$(MonoGameVersion)" />
+
+    <XmlPoke
+      XmlInputPath="%(MGProjects.Identity)"
+      Query="/Project/ItemGroup/PackageReference[starts-with(@Include, 'MonoGame.Runtime')]/@Version"
+      Value="$(MonoGameVersion)" />
+
+    <XmlPoke
+      XmlInputPath="%(MGProjects.Identity)"
+      Query="/Project/ItemGroup/PackageReference[starts-with(@Include, 'MonoGame.Content')]/@Version"
+      Value="$(MonoGameVersion)" />
+
     <ItemGroup>
       <MGToolManifest Include="**\.config\dotnet-tools.json" />
     </ItemGroup>