diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml
index 1d1e951..69a60fa 100644
--- a/azure-pipelines.yaml
+++ b/azure-pipelines.yaml
@@ -1,10 +1,13 @@
 trigger:
 - main
-pr: none
+pr:
+  - main
 variables:
   MajorVersion : 0
   MinorVersion : 0
-  PatchVersion : $[counter(format('nexus-extension-{0}.{1}',variables['MajorVersion'],variables['MinorVersion']), 48)]
+  PatchVersion : $[counter(format('nexus-extension-{0}.{1}.{2}',variables['Build.SourceBranchName'],variables['MajorVersion'],variables['MinorVersion']), 90)]
+  isPR : $[startsWith(variables['Build.SourceBranch'],'refs/pull/')] 
+  isMain : $[startsWith(variables['Build.SourceBranch'],'refs/heads/main')] 
 stages:
   - stage : build_package
     displayName: Build & Package Extension
@@ -27,23 +30,32 @@ stages:
           displayName: 'Install Dependencies'
         - script: npm run lint
           displayName: 'Run ESLint'
+          condition: eq(variables.isPR, true)
+        - script: |
+            npm run build
+          condition: eq(variables.isPR, true)
+          displayName: 'Build Extension'
         - script: |
             npm run package -- --override {\"version\": \"$(MajorVersion).$(MinorVersion).$(PatchVersion)\"}
           displayName: 'Build & Package Extension'
+          condition: eq(variables.isMain, true)
         - task: PowerShell@2
           displayName: 'Tag Git Commit'
+          condition: eq(variables.isMain, true)
           inputs:
             targetType: 'inline'
             script: |
               git tag "v$(MajorVersion).$(MinorVersion).$(PatchVersion)"
         - task: PowerShell@2
           displayName: 'Push Git Tags'
+          condition: eq(variables.isMain, true)
           inputs:
             targetType: 'inline'
             script: |
               git push --tags
         - task: GitHubRelease@1
           displayName: 'Publish Extension as Release'
+          condition: eq(variables.isMain, true)
           inputs:
             gitHubConnection: 'github.com_keyoke'
             repositoryName: '$(Build.Repository.Name)'