diff --git a/deploy/aro/azure-devops-templates/api-gw-deploy.yml b/deploy/aro/azure-devops-templates/api-gw-deploy.yml
index 5e4c0c920..b06299015 100644
--- a/deploy/aro/azure-devops-templates/api-gw-deploy.yml
+++ b/deploy/aro/azure-devops-templates/api-gw-deploy.yml
@@ -12,7 +12,7 @@ jobs:
   - task: colinsalmcorner.colinsalmcorner-buildtasks.replace-tokens-task.ReplaceTokens@1
     displayName: 'Replace tokens in envoy.yaml'
     inputs:
-      sourcePath: ./deploy/aro/$(AppName)
+      sourcePath: ./deploy/aro/${{ parameters.AppName }}
       filePattern: envoy.yaml
   - task: redhat.openshift-vsts.oc-setup-task.oc-setup@2
     displayName: 'Setup Openshift CLI'
@@ -21,12 +21,12 @@ jobs:
   - script: 'oc project $(OpenShiftProject)'
     failOnStderr: true
     displayName: 'Set OpenShift Project Context'
-  - script: 'oc delete configmap $(AppName)-config-map'
+  - script: 'oc delete configmap ${{ parameters.AppName }}-config-map'
     failOnStderr: false
     displayName: 'Delete Envoy ConfigMap'
-  - script: 'oc create configmap $(AppName)-config-map --from-file=./deploy/aro/$(AppName)/envoy.yaml'
+  - script: 'oc create configmap ${{ parameters.AppName }}-config-map --from-file=./deploy/aro/${{ parameters.AppName }}/envoy.yaml'
     failOnStderr: true
     displayName: 'Create Envoy ConfigMap'
-  - script: 'oc process -f ./deploy/aro/apigw-templates/apigw-deploy-template.yml -p APPLICATION_NAME=$(AppName) -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) | oc apply -f-'
+  - script: 'oc process -f ./deploy/aro/apigw-templates/apigw-deploy-template.yml -p APPLICATION_NAME=${{ parameters.AppName }} -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) | oc apply -f-'
     failOnStderr: true
-    displayName: 'Ensure $(AppTitle) OpenShift Application'
\ No newline at end of file
+    displayName: 'Ensure ${{ parameters.AppTitle }} OpenShift Application'
\ No newline at end of file