diff --git a/deploy/aro/mobilemarketingapigw/azure-pipelines.yml b/deploy/aro/mobilemarketingapigw/azure-pipelines.yml
index 244bc1419..417f3ca2e 100644
--- a/deploy/aro/mobilemarketingapigw/azure-pipelines.yml
+++ b/deploy/aro/mobilemarketingapigw/azure-pipelines.yml
@@ -23,6 +23,11 @@ stages:
         pool: 
           vmImage: 'windows-latest'
         steps:
+        - task: colinsalmcorner.colinsalmcorner-buildtasks.replace-tokens-task.ReplaceTokens@1
+          displayName: 'Replace tokens in envoy.yaml'
+          inputs:
+            sourcePath: ./deploy/aro/mobilemarketingapigw
+            filePattern: envoy.yaml
         - task: redhat.openshift-vsts.oc-setup-task.oc-setup@2
           displayName: 'Setup Openshift CLI'
           inputs:
diff --git a/deploy/aro/mobileshoppingapigw/azure-pipelines.yml b/deploy/aro/mobileshoppingapigw/azure-pipelines.yml
index 1a718fec9..41fc27f4e 100644
--- a/deploy/aro/mobileshoppingapigw/azure-pipelines.yml
+++ b/deploy/aro/mobileshoppingapigw/azure-pipelines.yml
@@ -23,6 +23,11 @@ stages:
         pool: 
           vmImage: 'windows-latest'
         steps:
+        - task: colinsalmcorner.colinsalmcorner-buildtasks.replace-tokens-task.ReplaceTokens@1
+          displayName: 'Replace tokens in envoy.yaml'
+          inputs:
+            sourcePath: ./deploy/aro/mobileshoppingapigw
+            filePattern: envoy.yaml
         - task: redhat.openshift-vsts.oc-setup-task.oc-setup@2
           displayName: 'Setup Openshift CLI'
           inputs:
diff --git a/deploy/aro/webmarketingapigw/azure-pipelines.yml b/deploy/aro/webmarketingapigw/azure-pipelines.yml
index a14eed71e..fa36adea2 100644
--- a/deploy/aro/webmarketingapigw/azure-pipelines.yml
+++ b/deploy/aro/webmarketingapigw/azure-pipelines.yml
@@ -23,6 +23,11 @@ stages:
         pool: 
           vmImage: 'windows-latest'
         steps:
+        - task: colinsalmcorner.colinsalmcorner-buildtasks.replace-tokens-task.ReplaceTokens@1
+          displayName: 'Replace tokens in envoy.yaml'
+          inputs:
+            sourcePath: ./deploy/aro/webmarketingapigw
+            filePattern: envoy.yaml
         - task: redhat.openshift-vsts.oc-setup-task.oc-setup@2
           displayName: 'Setup Openshift CLI'
           inputs:
diff --git a/deploy/aro/webshoppingapigw/azure-pipelines.yml b/deploy/aro/webshoppingapigw/azure-pipelines.yml
index a409b8bcb..72ec61423 100644
--- a/deploy/aro/webshoppingapigw/azure-pipelines.yml
+++ b/deploy/aro/webshoppingapigw/azure-pipelines.yml
@@ -23,6 +23,11 @@ stages:
         pool: 
           vmImage: 'windows-latest'
         steps:
+        - task: colinsalmcorner.colinsalmcorner-buildtasks.replace-tokens-task.ReplaceTokens@1
+          displayName: 'Replace tokens in envoy.yaml'
+          inputs:
+            sourcePath: ./deploy/aro/webshoppingapigw
+            filePattern: envoy.yaml
         - task: redhat.openshift-vsts.oc-setup-task.oc-setup@2
           displayName: 'Setup Openshift CLI'
           inputs: