diff --git a/build/pipelines/templates/run-ui-tests.yaml b/build/pipelines/templates/run-ui-tests.yaml
index 41d441ad..070293db 100644
--- a/build/pipelines/templates/run-ui-tests.yaml
+++ b/build/pipelines/templates/run-ui-tests.yaml
@@ -15,10 +15,6 @@ jobs:
   steps:
   - checkout: none
 
-  - powershell: Set-DisplayResolution -Width 1920 -Height 1080 -Force
-    displayName: Set resolution to 1920x1080
-    continueOnError: true
-
   - task: DownloadBuildArtifacts@0
     displayName: Download AppxBundle and CalculatorUITests
     inputs:
@@ -39,8 +35,10 @@ jobs:
       filePath: $(Build.ArtifactStagingDirectory)/drop/Release/${{ parameters.platform }}/Calculator/AppPackages/Calculator_$(Build.BuildNumber)_Test/Add-AppDevPackage.ps1
       arguments: -Force
 
-  - powershell: Start-Process -FilePath "C:\Program Files (x86)\Windows Application Driver\WinAppDriver.exe" -Verb RunAs
-    displayName: Start WinAppDriver
+  - task: WinAppDriver.winappdriver-pipelines-task.winappdriver-pipelines-task.Windows Application Driver@0
+    displayName: 'WinAppDriver - Start'
+    inputs:
+      AgentResolution: 1080p
 
   - task: VSTest@2
     displayName: Run CalculatorUITests
@@ -49,4 +47,9 @@ jobs:
       vsTestVersion: 16.0
       runSettingsFile: $(Build.ArtifactStagingDirectory)/drop/Release/${{ parameters.platform }}/publish/CalculatorUITests.runsettings
       platform: ${{ parameters.platform }}
-      configuration: Release
\ No newline at end of file
+      configuration: Release
+ 
+  - task: WinAppDriver.winappdriver-pipelines-task.winappdriver-pipelines-task.Windows Application Driver@0
+    displayName: 'WinAppDriver - Stop'
+    inputs:
+      OperationType: Stop
\ No newline at end of file