diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-PackTransportPackage-Stage.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-PackTransportPackage-Stage.yml
index 164e6f52d9..95164495c1 100644
--- a/build/AzurePipelinesTemplates/WindowsAppSDK-PackTransportPackage-Stage.yml
+++ b/build/AzurePipelinesTemplates/WindowsAppSDK-PackTransportPackage-Stage.yml
@@ -185,8 +185,7 @@ stages:
           }
 
           $buildType = '$(channel)'
-          $majorMinorPatchRev = '$(MajorVersion).$(MinorVersion).$(versionMinDate)'
-          $majorMinorPatchRev = $majorMinorPatchRev + $paddedRevision
+          $majorMinorPatchRev = '$(MajorVersion).$(MinorVersion).$(PatchVersion)'
           
           if ($env:ComponentType)
           {
@@ -219,7 +218,11 @@ stages:
             $formattedTag = ''
             if(-not [String]::IsNullOrEmpty($versionTag))
             {
-              $formattedTag = '-' + $versionTag
+              $formattedTag = '-' + $versionTag + "+" + $(versionMinDate) + $paddedRevision
+            }
+            else
+            {
+              $formattedTag = "+" + $(versionMinDate) + $paddedRevision
             }
             Write-Host "Using Release Versioning"
             $version = $majorMinorPatchRev + $formattedTag
diff --git a/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrap.cpp b/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrap.cpp
index d9e186cdd3..6171a49c99 100644
--- a/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrap.cpp
+++ b/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrap.cpp
@@ -508,12 +508,24 @@ std::wstring GetFrameworkPackageFamilyName(
     PCWSTR packageVersionTag{ !versionTag ? L"" : versionTag };
     PCWSTR packageVersionTagDelimiter{ (packageVersionTag[0] == L'\0') ? L"" : L"-"};
 
-    const std::wstring packageFamilyName{ std::format(L"{}.{}.{}{}{}_8wekyb3d8bbwe",
+    if (majorVersion == 1)
+    {
+        const std::wstring packageFamilyName{ std::format(L"{}.{}.{}{}{}_8wekyb3d8bbwe",
                                                       namePrefix, majorVersion, minorVersion,
                                                       packageVersionTagDelimiter, packageVersionTag) };
-    THROW_HR_IF_MSG(E_INVALIDARG, packageFamilyName.length() > PACKAGE_FAMILY_NAME_MAX_LENGTH, "%ls", packageFamilyName.c_str());
+        THROW_HR_IF_MSG(E_INVALIDARG, packageFamilyName.length() > PACKAGE_FAMILY_NAME_MAX_LENGTH, "%ls", packageFamilyName.c_str());
 
-    return packageFamilyName;
+        return packageFamilyName;
+    }
+    else
+    {
+        const std::wstring packageFamilyName{ std::format(L"{}.{}{}{}_8wekyb3d8bbwe",
+                                                      namePrefix, majorVersion,
+                                                      packageVersionTagDelimiter, packageVersionTag) };
+        THROW_HR_IF_MSG(E_INVALIDARG, packageFamilyName.length() > PACKAGE_FAMILY_NAME_MAX_LENGTH, "%ls", packageFamilyName.c_str());
+
+        return packageFamilyName;
+    }
 }
 
 /// Determine the path for the Windows App Runtime Framework package