diff --git a/deploy/aro/azure-devops-templates/variables.yml b/deploy/aro/azure-devops-templates/variables.yml
index 9b1257e20..6ba379e3f 100644
--- a/deploy/aro/azure-devops-templates/variables.yml
+++ b/deploy/aro/azure-devops-templates/variables.yml
@@ -1,7 +1,39 @@
 variables:
-  IdentityApiHostName: identityapi.$(OpenShiftProject).svc
   RedisHostname: redis.$(OpenShiftProject).svc
   RabbitMqHostname: rabbitmq.$(OpenShiftProject).svc
+  SqlHostName: mssql-server-linux.$(OpenShiftProjectName).svc
+  PublicHostName: eshop$(EnvironmentName)
+  IdentityApiHostName: identityapi.$(OpenShiftProject).svc
   IdentityPublicHostName: identity$(EnvironmentName)
   IdentityUrlExternal: https://$(IdentityPublicHostName)
-  IdentityApiUrl: http://$(IdentityApiHostName):8080
\ No newline at end of file
+  IdentityApiUrl: http://$(IdentityApiHostName):8080
+  BasketApiHostName: basketapi.$(OpenShiftProjectName).svc
+  BasketApiUrl: http://$(BasketApiHostName):8080
+  BasketApiHc: $(BasketApiUrl)/hc
+  CatalogApiHostName: catalogapi.$(OpenShiftProjectName).svc
+  CatalogApiUrl: http://$(CatalogApiHostName):8080
+  CatalogApiUrlExternal: https://$(CatalogPublicHostName)
+  CatalogApiHc: $(CatalogApiUrl)/hc
+  CatalogDbConnection: Server=$(SqlHostName);Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=$(SqlUsername);Password=$(SqlPassword)
+  LocationsApiHostName: locationsapi.$(OpenShiftProjectName).svc
+  LocationsApiUrl: http://$(LocationsApiHostName):8080
+  LocationsApiHc: $(LocationsApiUrl)/hc
+  MarketingApiHostName: marketingapi.$(OpenShiftProjectName).svc
+  MarketingApiUrl: http://$(MarketingApiHostName):8080
+  MarketingApiHc: $(MarketingApiUrl)/hc
+  OrderingApiHostName: orderingapi.$(OpenShiftProjectName).svc
+  OrderingApiUrl: http://$(OrderingApiHostName):8080
+  OrderingApiHc: $(OrderingApiUrl)/hc
+  MobileShoppingAggregatorHostName: mobileshoppingaggregator.$(OpenShiftProjectName).svc
+  MobileShoppingAggregatorUrl: http://$(MobileShoppingAggregatorHostName):8080
+  MobileShoppingAggregatorHc: $(MobileShoppingAggregatorUrl)/hc
+  WebShoppingAggregatorHostName: webshoppingaggregator.$(OpenShiftProjectName).svc
+  WebShoppingAggregatorUrl: http://$(WebShoppingAggregatorHostName):8080
+  WebShoppingAggregatorHc: $(WebShoppingAggregatorUrl)/hc
+  WebhooksApiHostName: webhooksapi.$(OpenShiftProjectName).svc
+  WebhooksApiUrl: http://$(WebhooksApiHostName):8080
+  WebhooksDbConnection: Server=$(SqlHostName);Database=Microsoft.eShopOnContainers.Services.WebhooksDb;User Id=$(SqlUsername);Password=$(SqlPassword)
+  WebhooksWebClientHostName: webhookclient.$(OpenShiftProjectName).svc
+  WebhooksWebClientUrl: http://$(WebhooksWebClientHostName):8080
+  WebSpaUrl: https://eshop-spa$(EnvironmentName)
+  WebMvcUrl: https://$(PublicHostName)
\ No newline at end of file
diff --git a/deploy/aro/identity-api/azure-pipelines.yml b/deploy/aro/identity-api/azure-pipelines.yml
index 8aa3686ff..029409b3d 100644
--- a/deploy/aro/identity-api/azure-pipelines.yml
+++ b/deploy/aro/identity-api/azure-pipelines.yml
@@ -35,6 +35,6 @@ stages:
         - script: 'oc project $(OpenShiftProject)'
           failOnStderr: true
           displayName: 'Set OpenShift Project Context'
-        - script: 'oc process -f ./deploy/aro/openshift-templates/identityapi-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p WEB_SPA_URL= -p WEB_MVC_URL= -p LOCATION_API_URL= -p MARKETING_API_URL= -p BASKET_API_URL= -p ORDERING_API_URL= -p MOBILE_SHOPPING_AGGREGATOR_URL= -p WEB_SHOPPING_AGGREGATOR_URL= -p WEBHOOKS_API_URL= -p WEBHOOKS_WEB_CLIENT_URL= | oc apply -f-'
+        - script: 'oc process -f ./deploy/aro/openshift-templates/identityapi-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p WEB_SPA_URL=$(WebSpaUrl) -p WEB_MVC_URL=$(WebMvcUrl) -p LOCATION_API_URL=$(LocationsApiUrl) -p MARKETING_API_URL=$(MarketingApiUrl) -p BASKET_API_URL=$(BasketApiUrl) -p ORDERING_API_URL=$(OrderingApiUrl) -p MOBILE_SHOPPING_AGGREGATOR_URL=$(MobileShoppingAggregatorUrl) -p WEB_SHOPPING_AGGREGATOR_URL=$(WebShoppingAggregatorUrl) -p WEBHOOKS_API_URL=$(WebhooksApiUrl) -p WEBHOOKS_WEB_CLIENT_URL=$(WebhooksWebClientUrl) | oc apply -f-'
           failOnStderr: true
           displayName: 'Ensure Identity API OpenShift DeploymentConfig and Service'
\ No newline at end of file