diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index e2bc7a1..a8de2fe 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -56,8 +56,12 @@ jobs:
         $env:PackageVersion = $env:PackageVersionOverride
       }
       Write-Host "build version set to $env:PackageVersion"
+      $prefix = $env:PackageVersion.Split('-')[0]
+      $suffix = $env:PackageVersion.Split('-')[1]
       Write-Host "##vso[build.updatebuildnumber]$env:PackageVersion"
       Write-Host "##vso[task.setvariable variable=PackageVersion;]$env:PackageVersion"
+      Write-Host "##vso[task.setvariable variable=VersionPrefix;]$prefix"
+      Write-Host "##vso[task.setvariable variable=VersionSuffix;]$suffix"
     env:
       PackageVersion: $(PackageVersion)
       PackageVersionOverride: $(PackageVersionOverride)
@@ -67,7 +71,7 @@ jobs:
     inputs:
       command: 'pack'
       packagesToPack: '$(Solution).sln'
-      arguments: '--configuration Release /p:Version=$(ProductVersion) /p:TreatWarningsAsErrors=True'
+      arguments: '--configuration $(buildConfiguration) /p:TreatWarningsAsErrors=True /p:VersionPrefix=$(VersionPrefix) /p:VersionSuffix=$(VersionSuffix)'
       versioningScheme: 'byEnvVar'
       versionEnvVar: 'PackageVersion'
   - task: 'DotNetCoreCLI@2'
diff --git a/config/versions-dev.props b/config/versions-dev.props
index 3d56926..cd50998 100644
--- a/config/versions-dev.props
+++ b/config/versions-dev.props
@@ -1,7 +1,5 @@
 <Project>
   <PropertyGroup>
-    <SteeltoeVersion>$(STEELTOE_VERSION)</SteeltoeVersion>
-    <SteeltoeVersionSuffix>$(STEELTOE_DASH_VERSION_SUFFIX)</SteeltoeVersionSuffix>
     <LightBDDXUnit2Version>2.4.3</LightBDDXUnit2Version>
     <McMasterExtensionsCommandLineUtilsVersion>2.2.5</McMasterExtensionsCommandLineUtilsVersion>
     <MicrosoftExtensionsVersion>2.1.1</MicrosoftExtensionsVersion>
diff --git a/config/versions.props b/config/versions.props
index 3d56926..cd50998 100644
--- a/config/versions.props
+++ b/config/versions.props
@@ -1,7 +1,5 @@
 <Project>
   <PropertyGroup>
-    <SteeltoeVersion>$(STEELTOE_VERSION)</SteeltoeVersion>
-    <SteeltoeVersionSuffix>$(STEELTOE_DASH_VERSION_SUFFIX)</SteeltoeVersionSuffix>
     <LightBDDXUnit2Version>2.4.3</LightBDDXUnit2Version>
     <McMasterExtensionsCommandLineUtilsVersion>2.2.5</McMasterExtensionsCommandLineUtilsVersion>
     <MicrosoftExtensionsVersion>2.1.1</MicrosoftExtensionsVersion>
diff --git a/src/Steeltoe.Cli/Steeltoe.Cli.csproj b/src/Steeltoe.Cli/Steeltoe.Cli.csproj
index 8ce0295..ddfb280 100644
--- a/src/Steeltoe.Cli/Steeltoe.Cli.csproj
+++ b/src/Steeltoe.Cli/Steeltoe.Cli.csproj
@@ -11,8 +11,8 @@
     <PackageProjectUrl>https://steeltoe.io</PackageProjectUrl>
     <PackageTags>Docker, CloudFoundry</PackageTags>
     <PackageLicense>https://www.apache.org/licenses/LICENSE-2.0</PackageLicense>
-    <VersionPrefix>$(SteeltoeVersion)</VersionPrefix>
-    <VersionSuffix>$(SteeltoeVersionSuffix)</VersionSuffix>
+    <VersionPrefix>$(VersionPrefix)</VersionPrefix>
+    <VersionSuffix>$(VersionSuffix)</VersionSuffix>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="$(McMasterExtensionsCommandLineUtilsVersion)" />
diff --git a/src/Steeltoe.Tooling/Steeltoe.Tooling.csproj b/src/Steeltoe.Tooling/Steeltoe.Tooling.csproj
index d30d628..2960b2c 100644
--- a/src/Steeltoe.Tooling/Steeltoe.Tooling.csproj
+++ b/src/Steeltoe.Tooling/Steeltoe.Tooling.csproj
@@ -9,8 +9,8 @@
     <PackageProjectUrl>https://steeltoe.io</PackageProjectUrl>
     <PackageTags>Docker, CloudFoundry</PackageTags>
     <PackageLicense>https://www.apache.org/licenses/LICENSE-2.0</PackageLicense>
-    <VersionPrefix>$(SteeltoeVersion)</VersionPrefix>
-    <VersionSuffix>$(SteeltoeVersionSuffix)</VersionSuffix>
+    <VersionPrefix>$(VersionPrefix)</VersionPrefix>
+    <VersionSuffix>$(VersionSuffix)</VersionSuffix>
  </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="$(McMasterExtensionsCommandLineUtilsVersion)" />