diff --git a/eng/Git.Build.targets b/eng/Git.Build.targets
index 73824b083aac..7c4c9fca949e 100644
--- a/eng/Git.Build.targets
+++ b/eng/Git.Build.targets
@@ -1,6 +1,6 @@
 <Project>
   <ItemGroup>
-    <PackageReference Include="GitInfo" Version="2.0.26" PrivateAssets="All" />
-    <PackageReference Include="MSBuilder.GenerateAssemblyInfo" Version="0.2.1" PrivateAssets="All" />
+    <PackageReference Include="GitInfo" Version="2.1.2" PrivateAssets="All" />
+    <PackageReference Include="MSBuilder.GenerateAssemblyInfo" Version="0.2.2" PrivateAssets="All" />
 	</ItemGroup>
  </Project>
diff --git a/eng/Version.targets b/eng/Version.targets
index 5073d9fd9ba7..8adf978d69a3 100644
--- a/eng/Version.targets
+++ b/eng/Version.targets
@@ -1,7 +1,7 @@
 <Project>
  <PropertyGroup>
     <NightlyTag>nightly</NightlyTag>
-    <RegexPre>pre\d</RegexPre>
+    <RegexTag>[a-z]+\.[0-9]</RegexTag>
  </PropertyGroup>
  <PropertyGroup>
     <GitBranch Condition="'$(SYSTEM_PULLREQUEST_TARGETBRANCH)' != ''">$(SYSTEM_PULLREQUEST_TARGETBRANCH)</GitBranch>
@@ -33,10 +33,26 @@
       GitVersion;
       $(SetVersionsDependsOn);
     </SetVersionsDependsOn>
+    <SetGitInfoPropsBefore>
+      GitInfo;
+      GitVersion;
+    </SetGitInfoPropsBefore>
   </PropertyGroup>
 
+  <Target Name="SetGitInfoProps" BeforeTargets="$(SetGitInfoPropsBefore)">
+    <PropertyGroup>
+      <GitDefaultBranch>main</GitDefaultBranch>
+      <GitIgnoreBranchVersion>true</GitIgnoreBranchVersion>
+      <GitIgnoreTagVersion>true</GitIgnoreTagVersion>
+    </PropertyGroup>
+  </Target>
   <Target Name="SetVersions" BeforeTargets="$(SetVersionsBefore)" DependsOnTargets="$(SetVersionsDependsOn)" Returns="$(Version)">
     <PropertyGroup>
+      <SemVerLabel>$([System.Text.RegularExpressions.Regex]::Match($(GitTag), $(RegexTag)))</SemVerLabel>
+      <GitDefaultBranch>main</GitDefaultBranch>
+      <GitIgnoreBranchVersion>true</GitIgnoreBranchVersion>
+      <GitIgnoreTagVersion>true</GitIgnoreTagVersion>
+      <GitSemVerLabel Condition=" '$(GitTag)' != '' and $([System.Text.RegularExpressions.Regex]::IsMatch('$(GitTag)', $(RegexTag))) ">$(SemVerLabel)</GitSemVerLabel> 
       <GitSemVerLabel  Condition="$(CI) and '$(BUILD_REASON)' == 'Schedule'">$(NightlyTag)</GitSemVerLabel>
       <GitSemVerDashLabel Condition="'$(GitSemVerLabel)' != ''" >-$(GitSemVerLabel)</GitSemVerDashLabel>
     </PropertyGroup>