diff --git a/.azure-pipelines/baseline_test/baseline.test.mgmt.public.master.yml b/.azure-pipelines/baseline_test/baseline.test.mgmt.public.master.yml
index 9d8658c14aa..22fb32de92c 100644
--- a/.azure-pipelines/baseline_test/baseline.test.mgmt.public.master.yml
+++ b/.azure-pipelines/baseline_test/baseline.test.mgmt.public.master.yml
@@ -28,6 +28,13 @@ stages:
   dependsOn:
   - Pre_test
   condition: succeeded('Pre_test')
+  variables:
+  - group: SONiC-Elastictest
+  - name: inventory
+    value: veos_vtb
+  - name: testbed_file
+    value: vtestbed.yaml
+  - group: GIT_SECRETS
   jobs:
   - template: baseline.test.template.yml
 
@@ -36,6 +43,13 @@ stages:
   - Pre_test
   - Test_round_1
   condition: and(succeeded('Pre_test'), succeededOrFailed('Test_round_1'))
+  variables:
+  - group: SONiC-Elastictest
+  - name: inventory
+    value: veos_vtb
+  - name: testbed_file
+    value: vtestbed.yaml
+  - group: GIT_SECRETS
   jobs:
   - template: baseline.test.template.yml
 
@@ -44,6 +58,13 @@ stages:
   - Pre_test
   - Test_round_2
   condition: and(succeeded('Pre_test'), succeededOrFailed('Test_round_2'))
+  variables:
+  - group: SONiC-Elastictest
+  - name: inventory
+    value: veos_vtb
+  - name: testbed_file
+    value: vtestbed.yaml
+  - group: GIT_SECRETS
   jobs:
   - template: baseline.test.template.yml
 
@@ -52,5 +73,12 @@ stages:
   - Pre_test
   - Test_round_3
   condition: and(succeeded('Pre_test'), succeededOrFailed('Test_round_3'))
+  variables:
+  - group: SONiC-Elastictest
+  - name: inventory
+    value: veos_vtb
+  - name: testbed_file
+    value: vtestbed.yaml
+  - group: GIT_SECRETS
   jobs:
   - template: baseline.test.template.yml
diff --git a/.azure-pipelines/baseline_test/baseline.test.template.yml b/.azure-pipelines/baseline_test/baseline.test.template.yml
index 3ec677dfdc0..62b15e89b82 100644
--- a/.azure-pipelines/baseline_test/baseline.test.template.yml
+++ b/.azure-pipelines/baseline_test/baseline.test.template.yml
@@ -1,11 +1,3 @@
-variables:
-- group: SONiC-Elastictest
-- name: inventory
-  value: veos_vtb
-- name: testbed_file
-  value: vtestbed.yaml
-- group: GIT_SECRETS
-
 jobs:
 - job: t0_elastictest
   displayName: "kvmtest-t0 by Elastictest"
@@ -13,7 +5,7 @@ jobs:
   continueOnError: false
   pool: ubuntu-20.04
   strategy:
-    parallel: $(BASELINE_MGMT_PUBLIC_MASTER_TEST_NUM)
+    parallel: $[ variables['BASELINE_MGMT_PUBLIC_MASTER_TEST_NUM'] ]
   steps:
   - template: ../run-test-elastictest-template.yml
     parameters:
@@ -32,7 +24,7 @@ jobs:
   continueOnError: false
   pool: ubuntu-20.04
   strategy:
-    parallel: $(BASELINE_MGMT_PUBLIC_MASTER_TEST_NUM)
+    parallel: $[ variables['BASELINE_MGMT_PUBLIC_MASTER_TEST_NUM'] ]
   steps:
   - template: ../run-test-elastictest-template.yml
     parameters:
@@ -53,7 +45,7 @@ jobs:
   continueOnError: false
   pool: ubuntu-20.04
   strategy:
-    parallel: $(BASELINE_MGMT_PUBLIC_MASTER_TEST_NUM)
+    parallel: $[ variables['BASELINE_MGMT_PUBLIC_MASTER_TEST_NUM'] ]
   steps:
   - template: ../run-test-elastictest-template.yml
     parameters:
@@ -72,7 +64,7 @@ jobs:
   continueOnError: false
   pool: ubuntu-20.04
   strategy:
-    parallel: $(BASELINE_MGMT_PUBLIC_MASTER_TEST_NUM)
+    parallel: $[ variables['BASELINE_MGMT_PUBLIC_MASTER_TEST_NUM'] ]
   steps:
     - template: ../run-test-elastictest-template.yml
       parameters:
@@ -92,7 +84,7 @@ jobs:
   continueOnError: false
   pool: ubuntu-20.04
   strategy:
-    parallel: $(BASELINE_MGMT_PUBLIC_MASTER_TEST_NUM)
+    parallel: $[ variables['BASELINE_MGMT_PUBLIC_MASTER_TEST_NUM'] ]
   steps:
     - template: ../run-test-elastictest-template.yml
       parameters:
@@ -113,7 +105,7 @@ jobs:
   continueOnError: false
   pool: ubuntu-20.04
   strategy:
-    parallel: $(BASELINE_MGMT_PUBLIC_MASTER_TEST_NUM)
+    parallel: $[ variables['BASELINE_MGMT_PUBLIC_MASTER_TEST_NUM'] ]
   steps:
     - template: ../run-test-elastictest-template.yml
       parameters:
@@ -135,7 +127,7 @@ jobs:
   continueOnError: false
   pool: ubuntu-20.04
   strategy:
-    parallel: $(BASELINE_MGMT_PUBLIC_MASTER_TEST_NUM)
+    parallel: $[ variables['BASELINE_MGMT_PUBLIC_MASTER_TEST_NUM'] ]
   steps:
     - template: ../run-test-elastictest-template.yml
       parameters: