diff --git a/azure-pipelines.vrt-baseline.yml b/azure-pipelines.vrt-baseline.yml
index 648178621a0f60..2c319f768e0209 100644
--- a/azure-pipelines.vrt-baseline.yml
+++ b/azure-pipelines.vrt-baseline.yml
@@ -33,8 +33,6 @@ jobs:
         env:
           API_TOKEN: $(fabric-public-pipeline-access-PAT)
           GITHUB_API_TOKEN: $(githubRepoStatusPAT)
-          STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING)
-          VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID)
           VR_APP_API_URL: $(VR_APP_API_URL)
           STORAGE_ACCOUNT_ID: $(StorageAccountId)
           TENANT_ID: $(TenantId)
@@ -66,8 +64,6 @@ jobs:
         env:
           API_TOKEN: $(fabric-public-pipeline-access-PAT)
           GITHUB_API_TOKEN: $(githubRepoStatusPAT)
-          STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING)
-          VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID)
           VR_APP_API_URL: $(VR_APP_API_URL)
           STORAGE_ACCOUNT_ID: $(StorageAccountId)
           TENANT_ID: $(TenantId)
@@ -99,8 +95,6 @@ jobs:
         env:
           API_TOKEN: $(fabric-public-pipeline-access-PAT)
           GITHUB_API_TOKEN: $(githubRepoStatusPAT)
-          STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING)
-          VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID)
           VR_APP_API_URL: $(VR_APP_API_URL)
           STORAGE_ACCOUNT_ID: $(StorageAccountId)
           TENANT_ID: $(TenantId)
@@ -131,8 +125,6 @@ jobs:
         env:
           API_TOKEN: $(fabric-public-pipeline-access-PAT)
           GITHUB_API_TOKEN: $(githubRepoStatusPAT)
-          STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING)
-          VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID)
           VR_APP_API_URL: $(VR_APP_API_URL)
           STORAGE_ACCOUNT_ID: $(StorageAccountId)
           TENANT_ID: $(TenantId)
diff --git a/azure-pipelines.vrt-pr.yml b/azure-pipelines.vrt-pr.yml
index 1f43dbf112c1f7..fbeb97ed538efa 100644
--- a/azure-pipelines.vrt-pr.yml
+++ b/azure-pipelines.vrt-pr.yml
@@ -27,53 +27,29 @@ jobs:
 
       - template: .devops/templates/tools.yml
 
-      - bash: |
-          postPolicy="true";
-          response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} --data-urlencode 'client_secret='${VR_APPROVAL_CLIENT_SECRET})
-            parsedResponse=${response/*"access_token"/}
-            token=${parsedResponse:3:${#parsedResponse}-5}
-            curl --location --request POST 'https://vrtfunctionappv0.azurewebsites.net/api/policyStateV2' \
-            --header 'Authorization: Bearer '"$token" \
-            --header 'Content-Type: application/json' \
-            --data-raw '	{
-            "organization": "uifabric",
-            "projectName": "fabricpublic",
-            "prId": $(System.PullRequest.PullRequestNumber),
-            "commitId": "$(Build.SourceVersion)",
-              "generate":true,
-              "clientType":"FLUENTUI",
-              "blockingPipeline":{
-              },
-              "nonBlockingPipeline":{
-                "$(pipelineId)": {
-                  "pipelineStatus": "PENDING",
-                  "pipelineName": "$(pipelineName)"
-                }
-              },
-              "postPolicy": '${postPolicy}',
-              "policyType": "OPTIONAL"
-            }'
-        displayName: 'Call policy State Api'
-        env:
-          VR_APPROVAL_HOST: $(VR_APPROVAL_HOST)
-          VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID)
-          VR_APPROVAL_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET)
-          VR_APP_CLIENT_URL: $(VR_APP_CLIENT_URL)
-
       - template: .devops/templates/runpublishvrscreenshot.yml
         parameters:
           fluentVersion: webcomponents
           vrTestPackageName: '@fluentui/vr-tests-web-components'
           vrTestPackagePath: 'apps/vr-tests-web-components'
 
+      - bash: |
+          set -exuo pipefail
+          yarn vr-app create-policy --nonBlockingPipelines '{"$(pipelineId)":{"pipelineStatus": "PENDING","pipelineName": "$(pipelineName)"}}' --clientType 'FLUENTUI'
+        displayName: VR App - Create Policy
+        env:
+          VR_APP_API_URL: $(VR_APP_API_URL)
+          TENANT_ID: $(TenantId)
+          PRINCIPAL_CLIENT_ID: $(PrincipalClientId)
+          SERVICE_CONNECTION_ID: $(ServiceConnectionId)
+          SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+
       - task: AzureCLI@2
         displayName: 'Run fluentui-screenshotdiff'
         env:
           API_TOKEN: $(fabric-public-pipeline-access-PAT)
           GITHUB_API_TOKEN: $(githubRepoStatusPAT)
-          STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING)
-          VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID)
-          VR_APP_API_URL: $(VR_APP_API_URL_NEW)
+          VR_APP_API_URL: $(VR_APP_API_URL)
           STORAGE_ACCOUNT_ID: $(StorageAccountId)
           TENANT_ID: $(TenantId)
           PRINCIPAL_CLIENT_ID: $(PrincipalClientId)
@@ -101,53 +77,29 @@ jobs:
 
       - template: .devops/templates/tools.yml
 
-      - bash: |
-          postPolicy="true";
-          response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} --data-urlencode 'client_secret='${VR_APPROVAL_CLIENT_SECRET} )
-            parsedResponse=${response/*"access_token"/}
-            token=${parsedResponse:3:${#parsedResponse}-5}
-            curl --location --request POST 'https://vrtfunctionappv0.azurewebsites.net/api/policyStateV2' \
-            --header 'Authorization: Bearer '"$token" \
-            --header 'Content-Type: application/json' \
-            --data-raw '	{
-            "organization": "uifabric",
-            "projectName": "fabricpublic",
-            "prId": $(System.PullRequest.PullRequestNumber),
-            "commitId": "$(Build.SourceVersion)",
-              "generate":true,
-              "clientType":"FLUENTUI",
-              "blockingPipeline":{
-              },
-              "nonBlockingPipeline":{
-                "$(pipelineId)": {
-                  "pipelineStatus": "PENDING",
-                  "pipelineName": "$(pipelineName)"
-                }
-              },
-              "postPolicy": '${postPolicy}',
-              "policyType": "OPTIONAL"
-            }'
-        displayName: 'Call policy State Api'
-        env:
-          VR_APPROVAL_HOST: $(VR_APPROVAL_HOST)
-          VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID)
-          VR_APPROVAL_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET)
-          VR_APP_CLIENT_URL: $(VR_APP_CLIENT_URL)
-
       - template: .devops/templates/runpublishvrscreenshot.yml
         parameters:
           fluentVersion: v9
           vrTestPackageName: '@fluentui/vr-tests-react-components'
           vrTestPackagePath: 'apps/vr-tests-react-components'
 
+      - bash: |
+          set -exuo pipefail
+          yarn vr-app create-policy --nonBlockingPipelines '{"$(pipelineId)":{"pipelineStatus": "PENDING","pipelineName": "$(pipelineName)"}}' --clientType 'FLUENTUI'
+        displayName: VR App - Create Policy
+        env:
+          VR_APP_API_URL: $(VR_APP_API_URL)
+          TENANT_ID: $(TenantId)
+          PRINCIPAL_CLIENT_ID: $(PrincipalClientId)
+          SERVICE_CONNECTION_ID: $(ServiceConnectionId)
+          SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+
       - task: AzureCLI@2
         displayName: 'Run fluentui-screenshotdiff'
         env:
           API_TOKEN: $(fabric-public-pipeline-access-PAT)
           GITHUB_API_TOKEN: $(githubRepoStatusPAT)
-          STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING)
-          VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID)
-          VR_APP_API_URL: $(VR_APP_API_URL_NEW)
+          VR_APP_API_URL: $(VR_APP_API_URL)
           STORAGE_ACCOUNT_ID: $(StorageAccountId)
           TENANT_ID: $(TenantId)
           PRINCIPAL_CLIENT_ID: $(PrincipalClientId)
@@ -174,53 +126,29 @@ jobs:
 
       - template: .devops/templates/tools.yml
 
-      - bash: |
-          postPolicy="true";
-          response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} --data-urlencode 'client_secret='${VR_APPROVAL_CLIENT_SECRET})
-            parsedResponse=${response/*"access_token"/}
-            token=${parsedResponse:3:${#parsedResponse}-5}
-            curl --location --request POST 'https://vrtfunctionappv0.azurewebsites.net/api/policyStateV2' \
-            --header 'Authorization: Bearer '"$token" \
-            --header 'Content-Type: application/json' \
-            --data-raw '	{
-            "organization": "uifabric",
-            "projectName": "fabricpublic",
-            "prId": $(System.PullRequest.PullRequestNumber),
-            "commitId": "$(Build.SourceVersion)",
-              "generate":true,
-              "clientType":"FLUENTUI",
-              "blockingPipeline":{
-              },
-              "nonBlockingPipeline":{
-                "$(pipelineId)": {
-                  "pipelineStatus": "PENDING",
-                  "pipelineName": "$(pipelineName)"
-                }
-              },
-              "postPolicy": '${postPolicy}',
-              "policyType": "OPTIONAL"
-            }'
-        displayName: 'Call policy State Api'
-        env:
-          VR_APPROVAL_HOST: $(VR_APPROVAL_HOST)
-          VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID)
-          VR_APPROVAL_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET)
-          VR_APP_CLIENT_URL: $(VR_APP_CLIENT_URL)
-
       - template: .devops/templates/runpublishvrscreenshot.yml
         parameters:
           fluentVersion: v8
           vrTestPackageName: '@fluentui/vr-tests'
           vrTestPackagePath: 'apps/vr-tests'
 
+      - bash: |
+          set -exuo pipefail
+          yarn vr-app create-policy --nonBlockingPipelines '{"$(pipelineId)":{"pipelineStatus": "PENDING","pipelineName": "$(pipelineName)"}}' --clientType 'FLUENTUI'
+        displayName: VR App - Create Policy
+        env:
+          VR_APP_API_URL: $(VR_APP_API_URL)
+          TENANT_ID: $(TenantId)
+          PRINCIPAL_CLIENT_ID: $(PrincipalClientId)
+          SERVICE_CONNECTION_ID: $(ServiceConnectionId)
+          SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+
       - task: AzureCLI@2
         displayName: 'Run fluentui-screenshotdiff'
         env:
           API_TOKEN: $(fabric-public-pipeline-access-PAT)
           GITHUB_API_TOKEN: $(githubRepoStatusPAT)
-          STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING)
-          VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID)
-          VR_APP_API_URL: $(VR_APP_API_URL_NEW)
+          VR_APP_API_URL: $(VR_APP_API_URL)
           STORAGE_ACCOUNT_ID: $(StorageAccountId)
           TENANT_ID: $(TenantId)
           PRINCIPAL_CLIENT_ID: $(PrincipalClientId)
@@ -248,52 +176,29 @@ jobs:
 
       - template: .devops/templates/tools.yml
 
-      - bash: |
-          postPolicy="true";
-          response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} --data-urlencode 'client_secret='${VR_APPROVAL_CLIENT_SECRET})
-            parsedResponse=${response/*"access_token"/}
-            token=${parsedResponse:3:${#parsedResponse}-5}
-            curl --location --request POST 'https://vrtfunctionappv0.azurewebsites.net/api/policyStateV2' \
-            --header 'Authorization: Bearer '"$token" \
-            --header 'Content-Type: application/json' \
-            --data-raw '	{
-            "organization": "uifabric",
-            "projectName": "fabricpublic",
-            "prId": $(System.PullRequest.PullRequestNumber),
-            "commitId": "$(Build.SourceVersion)",
-              "generate":true,
-              "clientType":"FLUENTUI",
-              "blockingPipeline":{
-              },
-              "nonBlockingPipeline":{
-                "$(pipelineId)": {
-                  "pipelineStatus": "PENDING",
-                  "pipelineName": "$(pipelineName)"
-                }
-              },
-              "postPolicy": '${postPolicy}',
-              "policyType": "OPTIONAL"
-            }'
-        displayName: 'Call policy State Api'
-        env:
-          VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID)
-          VR_APPROVAL_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET)
-          VR_APP_CLIENT_URL: $(VR_APP_CLIENT_URL)
-
       - template: .devops/templates/runpublishvrscreenshot.yml
         parameters:
           fluentVersion: v0
           vrTestPackageName: '@fluentui/docs'
           vrTestPackagePath: 'packages/fluentui/docs'
 
+      - bash: |
+          set -exuo pipefail
+          yarn vr-app create-policy --nonBlockingPipelines '{"$(pipelineId)":{"pipelineStatus": "PENDING","pipelineName": "$(pipelineName)"}}' --clientType 'FLUENTUI'
+        displayName: VR App - Create Policy
+        env:
+          VR_APP_API_URL: $(VR_APP_API_URL)
+          TENANT_ID: $(TenantId)
+          PRINCIPAL_CLIENT_ID: $(PrincipalClientId)
+          SERVICE_CONNECTION_ID: $(ServiceConnectionId)
+          SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+
       - task: AzureCLI@2
         displayName: 'Run fluentui-screenshotdiff'
         env:
           API_TOKEN: $(fabric-public-pipeline-access-PAT)
           GITHUB_API_TOKEN: $(githubRepoStatusPAT)
-          STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING)
-          VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID)
-          VR_APP_API_URL: $(VR_APP_API_URL_NEW)
+          VR_APP_API_URL: $(VR_APP_API_URL)
           STORAGE_ACCOUNT_ID: $(StorageAccountId)
           TENANT_ID: $(TenantId)
           PRINCIPAL_CLIENT_ID: $(PrincipalClientId)
diff --git a/package.json b/package.json
index 54c00ea0c93836..b6e9c5cf89a959 100644
--- a/package.json
+++ b/package.json
@@ -341,7 +341,7 @@
     "tslib": "2.6.3",
     "typescript": "5.0.4",
     "vinyl": "2.2.0",
-    "vr-approval-cli": "0.4.4",
+    "vr-approval-cli": "0.4.5",
     "webpack": "5.90.3",
     "webpack-bundle-analyzer": "4.10.1",
     "webpack-cli": "5.1.4",
diff --git a/yarn.lock b/yarn.lock
index 7c74128db84262..3360902642501c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -24603,10 +24603,10 @@ vm-browserify@^1.0.1:
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
   integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
 
-vr-approval-cli@0.4.4:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/vr-approval-cli/-/vr-approval-cli-0.4.4.tgz#a9377056996a69e2d54fa561118abdf599bab458"
-  integrity sha512-rQ3nFyHds7gy1paVb1pkQJVJuzf2CJyzvq2g4x1Qe9JQHSgAWITdpD0tfPTvCuwLh6JcZ3z3hTr+sTSHg5976Q==
+vr-approval-cli@0.4.5:
+  version "0.4.5"
+  resolved "https://registry.yarnpkg.com/vr-approval-cli/-/vr-approval-cli-0.4.5.tgz#315b5708f5a6cd6750887f5983f125dbe2d51169"
+  integrity sha512-ahZrf0WphWSx3YZ9JtYCO+FCxAuTmryg035k4Nv3DAZV01KjNrXrk8qfRu/uo2NdTizNUjx483pkeZkgihGHXA==
   dependencies:
     "@azure/identity" "^4.3.0"
     "@azure/storage-blob" "12.11.0"