diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index e5175a0a..3a0066ff 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -78,6 +78,13 @@ jobs:
           loadTestConfigFile: 'SampleApp.yaml'
           loadTestResource: ${{ env.LOAD_TEST_RESOURCE }}
           resourceGroup: ${{ env.LOAD_TEST_RESOURCE_GROUP }}
+          env: |
+            [
+              {
+              "name": "webapp",
+              "value": "${{ env.AZURE_WEBAPP_NAME }}.azurewebsites.net"
+              }
+            ]          
       
       - uses: actions/upload-artifact@v2
         with:
diff --git a/SampleApp.jmx b/SampleApp.jmx
index eaabd5b4..976c5cbf 100644
--- a/SampleApp.jmx
+++ b/SampleApp.jmx
@@ -33,7 +33,7 @@
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
-          <stringProp name="HTTPSampler.domain">issacnitineastustest76eastus.azurewebsites.net</stringProp>
+          <stringProp name="HTTPSampler.domain">${udv_webapp}</stringProp>
           <stringProp name="HTTPSampler.port"></stringProp>
           <stringProp name="HTTPSampler.protocol">https</stringProp>
           <stringProp name="HTTPSampler.contentEncoding"></stringProp>
@@ -93,7 +93,7 @@
               </elementProp>
             </collectionProp>
           </elementProp>
-          <stringProp name="HTTPSampler.domain">issacnitineastustest76eastus.azurewebsites.net</stringProp>
+          <stringProp name="HTTPSampler.domain">${udv_webapp}</stringProp>
           <stringProp name="HTTPSampler.port"></stringProp>
           <stringProp name="HTTPSampler.protocol">https</stringProp>
           <stringProp name="HTTPSampler.contentEncoding"></stringProp>
@@ -146,7 +146,7 @@
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
-          <stringProp name="HTTPSampler.domain">issacnitineastustest76eastus.azurewebsites.net</stringProp>
+          <stringProp name="HTTPSampler.domain">${udv_webapp}</stringProp>
           <stringProp name="HTTPSampler.port"></stringProp>
           <stringProp name="HTTPSampler.protocol">https</stringProp>
           <stringProp name="HTTPSampler.contentEncoding"></stringProp>
@@ -178,6 +178,17 @@
         </kg.apc.jmeter.timers.VariableThroughputTimer>
         <hashTree/>
       </hashTree>
+      <Arguments guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="udv_webapp" elementType="Argument">
+            <stringProp name="Argument.name">udv_webapp</stringProp>
+            <stringProp name="Argument.value">${__BeanShell( System.getenv("webapp") )}</stringProp>
+            <stringProp name="Argument.desc">Web App URL</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </Arguments>
+      <hashTree/>      
     </hashTree>
   </hashTree>
 </jmeterTestPlan>
diff --git a/SampleApp_Secrets.jmx b/SampleApp_Secrets.jmx
index 2d11b0e9..bf85a919 100644
--- a/SampleApp_Secrets.jmx
+++ b/SampleApp_Secrets.jmx
@@ -20,6 +20,12 @@
             <stringProp name="Argument.desc">Value for x-secret header </stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
+          <elementProp name="udv_webapp" elementType="Argument">
+            <stringProp name="Argument.name">udv_webapp</stringProp>
+            <stringProp name="Argument.value">${__BeanShell( System.getenv("webapp") )}</stringProp>
+            <stringProp name="Argument.desc">Web App URL</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
         </collectionProp>
       </Arguments>
       <hashTree/>
@@ -53,7 +59,7 @@
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
-          <stringProp name="HTTPSampler.domain">isaacnitinwus2.azurewebsites.net</stringProp>
+          <stringProp name="HTTPSampler.domain">${udv_webapp}</stringProp>
           <stringProp name="HTTPSampler.port"></stringProp>
           <stringProp name="HTTPSampler.protocol">https</stringProp>
           <stringProp name="HTTPSampler.contentEncoding"></stringProp>
@@ -122,7 +128,7 @@
               </elementProp>
             </collectionProp>
           </elementProp>
-          <stringProp name="HTTPSampler.domain">isaacnitinwus2.azurewebsites.net</stringProp>
+          <stringProp name="HTTPSampler.domain">${udv_webapp}</stringProp>
           <stringProp name="HTTPSampler.port"></stringProp>
           <stringProp name="HTTPSampler.protocol">https</stringProp>
           <stringProp name="HTTPSampler.contentEncoding"></stringProp>
@@ -184,7 +190,7 @@
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
-          <stringProp name="HTTPSampler.domain">isaacnitinwus2.azurewebsites.net</stringProp>
+          <stringProp name="HTTPSampler.domain">${udv_webapp}</stringProp>
           <stringProp name="HTTPSampler.port"></stringProp>
           <stringProp name="HTTPSampler.protocol">https</stringProp>
           <stringProp name="HTTPSampler.contentEncoding"></stringProp>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 660e40c6..f1348617 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -59,10 +59,10 @@ stages:
         subscriptionId: $(azureSubscriptionId)
         action: 'Create Or Update Resource Group'
         resourceGroupName: '$(webAppName)-rg'
-        location: 'East US'
+        location: $(location)
         templateLocation: 'Linked artifact'
         csmFile: '$(System.DefaultWorkingDirectory)/windows-webapp-template.json'
-        overrideParameters: '-webAppName $(webAppName) -hostingPlanName $(webAppName)-host -appInsightsLocation "East US" -databaseAccountId $(webAppName)db -databaseAccountLocation "East US"'
+        overrideParameters: '-webAppName $(webAppName) -hostingPlanName $(webAppName)-host -appInsightsLocation "$(location)" -databaseAccountId $(webAppName)db -databaseAccountLocation "$(location)"'
         deploymentMode: 'Incremental'
         deploymentOutputs: 'output'
     
@@ -133,6 +133,13 @@ stages:
         loadTestConfigFile: 'SampleApp.yaml'
         resourceGroup: $(loadTestResourceGroup)
         loadTestResource: $(loadTestResource)
-
+        env: |
+          [
+            {
+            "name": "webapp",
+            "value": "$(webAppName).azurewebsites.net"
+            }
+          ]
+          
     - publish: $(System.DefaultWorkingDirectory)/loadTest
       artifact: results