diff --git a/azure-pipelines-build-number.yml b/azure-pipelines-build-number.yml
index c437c68d..94356add 100644
--- a/azure-pipelines-build-number.yml
+++ b/azure-pipelines-build-number.yml
@@ -3,4 +3,10 @@ steps:
   inputs:
     targetType: inline
     script: |
-      Write-Host "##vso[build.updatebuildnumber]$(Date:yyMMdd)$(Rev:.r)" 
\ No newline at end of file
+      $date = (Get-Date).ToString("yyMMdd")
+      $previousBuildNumber = $($env:BUILD_BUILDNUMBER) 
+
+      $buildNumberParts = $($env:BUILD_BUILDNUMBER) -split '\.' 
+      $revision = [int]$buildNumberParts[$buildNumberParts.Length-1] 
+      $newBuildNumber = "$date$revision"
+      Write-Host "##vso[build.updatebuildnumber]$newBuildNumber" 
\ No newline at end of file