diff --git a/package.json b/package.json
index 5b80177921..69dbf90c5b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "powershell",
   "displayName": "PowerShell",
-  "version": "1.12.1",
+  "version": "2019.5.0",
   "preview": false,
   "publisher": "ms-vscode",
   "description": "Develop PowerShell scripts in Visual Studio Code!",
diff --git a/vscode-powershell.build.ps1 b/vscode-powershell.build.ps1
index b57b35cfca..9b6ecd8003 100644
--- a/vscode-powershell.build.ps1
+++ b/vscode-powershell.build.ps1
@@ -135,7 +135,7 @@ task UpdateReadme -If { $script:PackageJson.version -like "*preview*" } {
 }
 
 task UpdatePackageJson {
-    if ($script:PackageJson.version -like "*preview*") {
+    if ($script:PackageJson.name -like "*preview*" -or $script:PackageJson.displayName -like "*preview*") {
         $script:PackageJson.name = "powershell-preview"
         $script:PackageJson.displayName = "PowerShell Preview"
         $script:PackageJson.description = "(Preview) Develop PowerShell scripts in Visual Studio Code!"
@@ -147,8 +147,20 @@ task UpdatePackageJson {
         $script:PackageJson.preview = $false
     }
 
-    $revision = if ($env:BUILD_BUILDID) { $env:BUILD_BUILDID } else { 9999 }
-    $script:PackageJson.version = "$(Get-Date -Format 'yyyy.M').$revision"
+    $currentVersion = [version](($script:PackageJson.version -split "-")[0])
+    $currentDate = Get-Date
+
+    $revision = if ($currentDate.Month -eq $currentVersion.Minor) {
+        $currentVersion.Build + 1
+    } else {
+        0
+    }
+
+    $script:PackageJson.version = "$($currentDate.ToString('yyyy.M')).$revision"
+
+    if ($env:TF_BUILD) {
+        $script:PackageJson.version += "-CI.$env:BUILD_BUILDID"
+    }
 
     $Utf8NoBomEncoding = [System.Text.UTF8Encoding]::new($false)
     [System.IO.File]::WriteAllLines(
@@ -156,7 +168,8 @@ task UpdatePackageJson {
         ($script:PackageJson | ConvertTo-Json -Depth 100),
         $Utf8NoBomEncoding)
 }
-task Package UpdateReadme, UpdatePackageJson, {
+
+task Package UpdateReadme, {
 
     if ($script:psesBuildScriptPath) {
         Write-Host "`n### Copying PowerShellEditorServices module files" -ForegroundColor Green
@@ -181,4 +194,4 @@ task Package UpdateReadme, UpdatePackageJson, {
 # The set of tasks for a release
 task Release Clean, Build, Test, Package
 # The default task is to run the entire CI build
-task . Clean, BuildAll, Test, Package, UploadArtifacts
+task . Clean, BuildAll, Test, UpdatePackageJson, Package, UploadArtifacts