diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index bdf0bed64..958d2ceb9 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -13,16 +13,15 @@ pool:
 # see: https://docs.microsoft.com/en-us/azure/devops/pipelines/process/run-number?view=azure-devops&tabs=yaml
 name: $(Build.DefinitionName).$(SourceBranchName).$(Date:yyyyMMdd)$(Rev:.r)
 
-variables:
-  # Sonar scanner does not allow branch name to be set for Pull Requests (PRs), but returns an error if not specified for CI builds.
-  # This conditional block only passes the branch name if build is not for a PR, otherwise it passes the Sonar PR params:
-  if {{ $[ne(variables['Build.Reason'], 'PullRequest')] }}:
-    SonarExtraProperties: 'sonar.branch.name=$(Build.SourceBranchName)'
-  if {{ $[eq(variables['Build.Reason'], 'PullRequest')] }}:
-    SonarExtraProperties: 'sonar.pullrequest.key=$(System.PullRequest.PullRequestId) sonar.pullrequest.branch=$(Build.SourceBranchName) sonar.pullrequest.base=$(System.PullRequest.TargetBranch)'
-
 jobs:
   - job: BuildTestDeploy
+    variables:
+      # Sonar scanner does not allow branch name to be set for Pull Requests (PRs), but returns an error if not specified for CI builds.
+      # This conditional block only passes the branch name if build is not for a PR, otherwise it passes the Sonar PR params:
+      ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
+        SonarExtraProperties: 'sonar.branch.name=$(Build.SourceBranchName)'
+      ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
+        SonarExtraProperties: 'sonar.pullrequest.key=$(System.PullRequest.PullRequestId) sonar.pullrequest.branch=$(Build.SourceBranchName) sonar.pullrequest.base=$(System.PullRequest.TargetBranch)'
     displayName: Build Test and Deploy spring-petclinic Java Web App
     steps: