diff --git a/azure-pipelines-arcade-PR.yml b/azure-pipelines-arcade-PR.yml
index e15fda36364..1ccc532e302 100644
--- a/azure-pipelines-arcade-PR.yml
+++ b/azure-pipelines-arcade-PR.yml
@@ -1,9 +1,3 @@
-parameters:
-- name: _RunWithCoreWcfService
-  displayName: Run tests using CoreWCF service
-  type: boolean
-  default: false
-
 # trigger ci builds for merged PRs into listed branches
 # Setting batch to true, triggers one build at a time.
 # if there is a push while a build in progress, it will wait,
@@ -37,7 +31,8 @@ variables:
     value: true
   - name: _RunAsInternal
     value: false
-  
+  - name: _RunWithCoreWcfService
+    value: false
   - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
     - name: _RunAsPublic
       value: false
@@ -115,7 +110,7 @@ stages:
             Write-Host "##vso[task.setvariable variable=_serviceUri]wcfcoresrv23.westus3.cloudapp.azure.com/WcfService$(_WcfPRServiceId)"
 
           displayName: Update _updateService variable
-          condition: and(eq(variables._RunAsPublic, True), ne('${{ parameters._RunWithCoreWcfService }}', True))
+          condition: and(eq(variables._RunAsPublic, True), ne(variables._RunWithCoreWcfService, True))
 
         - ${{ if eq(variables._RunAsPublic, True) }}:
           - template: /eng/UpdatePRService.yml
@@ -138,7 +133,7 @@ stages:
             -projects $(Build.SourcesDirectory)/eng/SendToHelix.proj
             $(_TestArgs)
             /p:TestJob=Windows
-            /p:RunWithCoreWcfService=${{ parameters._RunWithCoreWcfService }}
+            /p:RunWithCoreWcfService=$(variables._RunWithCoreWcfService)
             /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog
           displayName: Windows - Run Helix Tests
           env:
@@ -187,7 +182,7 @@ stages:
               Write-Host "##vso[task.setvariable variable=_serviceUri]wcfcoresrv23.westus3.cloudapp.azure.com/WcfService$(_WcfPRServiceId)"
 
             displayName: Update _updateService variable
-            condition: and(eq(variables._RunAsPublic, True), ne('${{ parameters._RunWithCoreWcfService }}', True))
+            condition: and(eq(variables._RunAsPublic, True), ne(variables._RunWithCoreWcfService, True))
 
           - template: /eng/UpdatePRService.yml
             parameters:
@@ -207,7 +202,7 @@ stages:
               --projects $(Build.SourcesDirectory)/eng/SendToHelix.proj
               $(_TestArgs)
               /p:TestJob=Linux
-              /p:RunWithCoreWcfService=${{ parameters._RunWithCoreWcfService }}
+              /p:RunWithCoreWcfService=$(variables._RunWithCoreWcfService)
               /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog
             displayName: Linux - Run Helix Tests
             env:
@@ -254,7 +249,7 @@ stages:
               Write-Host "##vso[task.setvariable variable=_serviceUri]wcfcoresrv23.westus3.cloudapp.azure.com/WcfService$(_WcfPRServiceId)"
 
             displayName: Update _updateService variable
-            condition: and(eq(variables._RunAsPublic, True), ne('${{ parameters._RunWithCoreWcfService }}', True))
+            condition: and(eq(variables._RunAsPublic, True), ne(variables._RunWithCoreWcfService, True))
 
           - template: /eng/UpdatePRService.yml
             parameters:
@@ -274,7 +269,7 @@ stages:
               -projects $(Build.SourcesDirectory)/eng/SendToHelix.proj
               $(_TestArgs)
               /p:TestJob=MacOS
-              /p:RunWithCoreWcfService=${{ parameters._RunWithCoreWcfService }}
+              /p:RunWithCoreWcfService=$(variables._RunWithCoreWcfService)
               /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog
             displayName: MacOS - Run Helix Tests
             env: