diff --git a/azure-pipelines-build.yml b/azure-pipelines-build.yml
index 86411dd88..4286276ca 100644
--- a/azure-pipelines-build.yml
+++ b/azure-pipelines-build.yml
@@ -6,6 +6,7 @@ trigger:
     include:
       - develop
       - refs/tags/staging-*
+      - refs/tags/release-*
       # other examples:
       #- release/*
       #- refs/tags/*
@@ -48,7 +49,9 @@ extends:
   #parameters:
   #imagetag: ${{ parameters.imagetag }}
   parameters:
-    ${{ if startsWith(variables['Build.SourceBranch'], 'refs/tags/staging-') }}:
+    ${{ if startsWith(variables['Build.SourceBranch'], 'refs/tags/release-') }}:
+      buildenv: -prod
+    ${{ elseif startsWith(variables['Build.SourceBranch'], 'refs/tags/staging-') }}:
       buildenv: -staging
     ${{ else }}:
       buildenv: -dev
diff --git a/azure-pipelines-prod.yml b/azure-pipelines-prod.yml
index 0757c5745..134390408 100644
--- a/azure-pipelines-prod.yml
+++ b/azure-pipelines-prod.yml
@@ -30,7 +30,6 @@ parameters:
     default: "-prod"
     values:
       - "-prod"
-      - "-dev"
 
 
 # Image tag name for Fuse projects
diff --git a/azure-pipelines-stage.yml b/azure-pipelines-stage.yml
index 971f43429..d46811340 100644
--- a/azure-pipelines-stage.yml
+++ b/azure-pipelines-stage.yml
@@ -6,9 +6,10 @@ parameters:
   - name: buildenv
     displayName: Build environment
     type: string
-    default: "-prod"
+    default: "-staging"
     values:
       - "-prod"
+      - "-staging"
       - "-dev"