diff --git a/azure-pipelines-release-nightly.yml b/azure-pipelines-release-nightly.yml
index 407957058..81ee08c88 100644
--- a/azure-pipelines-release-nightly.yml
+++ b/azure-pipelines-release-nightly.yml
@@ -16,6 +16,10 @@ pool:
   demands:
     - ImageOverride -equals MMS2022TLS
 
+variables:
+
+  - name: PackageSuffix
+      value: 'ci.$(Build.BuildNumber)' # the "ci" section is to denote this payload is automatically released by the CI
 steps:
 
 # Configure all the .NET SDK versions we need
diff --git a/azure-pipelines-release.yml b/azure-pipelines-release.yml
index 03fdfbdad..6dc866632 100644
--- a/azure-pipelines-release.yml
+++ b/azure-pipelines-release.yml
@@ -6,6 +6,17 @@ pool:
   demands:
     - ImageOverride -equals MMS2022TLS
 
+variables:
+
+  - name: PackageSuffix
+    # if source branch is not `dev` then we're generating a release based on a feature branch
+    # In that case, we populate the environment variable "PackageSuffix" accordingly
+    ${{ if ne(variables['Build.SourceBranchName'], 'dev') }}:
+      value: 'pr.$(Build.BuildNumber)' # the "pr" section is to denote this code is a candidate to be PR'ed
+    ${{ else }}:
+      value: ''
+
+
 steps:
 
 # Configure all the .NET SDK versions we need
diff --git a/src/WebJobs.Extensions.DurableTask/WebJobs.Extensions.DurableTask.csproj b/src/WebJobs.Extensions.DurableTask/WebJobs.Extensions.DurableTask.csproj
index bbea9950d..63c8523d6 100644
--- a/src/WebJobs.Extensions.DurableTask/WebJobs.Extensions.DurableTask.csproj
+++ b/src/WebJobs.Extensions.DurableTask/WebJobs.Extensions.DurableTask.csproj
@@ -7,7 +7,7 @@
     <MajorVersion>2</MajorVersion>
     <MinorVersion>13</MinorVersion>
     <PatchVersion>1</PatchVersion>
-    <Version>$(MajorVersion).$(MinorVersion).$(PatchVersion)</Version>
+    <VersionSuffix>$(PackageSuffix)</VersionSuffix>
     <FileVersion>$(MajorVersion).$(MinorVersion).$(PatchVersion)</FileVersion>
     <AssemblyVersion>$(MajorVersion).0.0.0</AssemblyVersion>
     <Company>Microsoft Corporation</Company>
@@ -21,6 +21,14 @@
     <NoWarn>NU5125;SA0001</NoWarn>
   </PropertyGroup>
 
+  <PropertyGroup Condition="$(VersionSuffix) == ''">
+    <Version>$(MajorVersion).$(MinorVersion).$(PatchVersion)</Version>
+  </PropertyGroup>
+  <PropertyGroup Condition="$(VersionSuffix) != ''">
+    <Version>$(MajorVersion).$(MinorVersion).$(PatchVersion)-$(VersionSuffix)</Version>
+  </PropertyGroup>
+
+
   <!-- NuGet Publishing Metadata -->
   <PropertyGroup>
     <Title>Azure Functions Durable Task Extension</Title>