diff --git a/templates/Umbraco.Templates.csproj b/templates/Umbraco.Templates.csproj
index 6a0d70646f..4543023507 100644
--- a/templates/Umbraco.Templates.csproj
+++ b/templates/Umbraco.Templates.csproj
@@ -43,4 +43,25 @@
       <PackagePath>UmbracoProject\wwwroot</PackagePath>
     </Content>
   </ItemGroup>
+
+  <!-- Update template.json files with the default UmbracoVersion value set to the current build version -->
+  <ItemGroup>
+    <PackageReference Include="Umbraco.JsonSchema.Extensions" Version="0.3.0" PrivateAssets="all" />
+  </ItemGroup>
+  <Target Name="GetUpdatedTemplateJsonPackageFiles" BeforeTargets="GenerateNuspec" AfterTargets="GetBuildVersion;GetUmbracoBuildVersion">
+    <ItemGroup>
+      <_TemplateJsonFiles Include="**\.template.config\template.json" Exclude="bin\**;obj\**" />
+      <_TemplateJsonFiles>
+        <DestinationFile>$(IntermediateOutputPath)%(RelativeDir)%(Filename)%(Extension)</DestinationFile>
+      </_TemplateJsonFiles>
+    </ItemGroup>
+    <Copy SourceFiles="@(_TemplateJsonFiles)" DestinationFiles="%(DestinationFile)" />
+    <JsonPathUpdateValue JsonFile="%(_TemplateJsonFiles.DestinationFile)" Path="$.symbols.UmbracoVersion.defaultValue" Value="&quot;$(PackageVersion)&quot;" />
+    <ItemGroup>
+      <_PackageFiles Remove="@(_TemplateJsonFiles)" />
+      <_PackageFiles Include="%(_TemplateJsonFiles.DestinationFile)">
+        <PackagePath>%(RelativeDir)</PackagePath>
+      </_PackageFiles>
+    </ItemGroup>
+  </Target>
 </Project>