diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index ea7e1ec3..6086aa77 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -54,40 +54,40 @@ jobs:
 
   - template: Publish-PowerShell.yml@templates
     parameters:
-      name: 'Publish_Windows_TestApp'
+      name: 'Publish_Windows'
       vmImage: 'windows-2022'
       BuildConfiguration: ${{ variables.BuildConfiguration }}
       Workloads: ${{ variables.Workloads }}
       PublishFramework: ${{ variables.PublishFramework }}
       PublishProject: 'TestApp'
-      PublishRuntime: 'win7-x64'
+      PublishRuntime: 'win-x64'
 
   - template: Publish-Bash.yml@templates
     parameters:
-      name: 'Publish_Ubuntu_TestApp'
+      name: 'Publish_Linux'
       vmImage: 'ubuntu-20.04'
       BuildConfiguration: ${{ variables.BuildConfiguration }}
       Workloads: ${{ variables.Workloads }}
       PublishFramework: ${{ variables.PublishFramework }}
       PublishProject: 'TestApp'
-      PublishRuntime: 'ubuntu.14.04-x64'
+      PublishRuntime: 'linux-x64'
 
   - template: Publish-Bash.yml@templates
     parameters:
-      name: 'Publish_Debian_TestApp'
-      vmImage: 'ubuntu-20.04'
+      name: 'Publish_macOS_x64'
+      vmImage: 'macOS-11'
       BuildConfiguration: ${{ variables.BuildConfiguration }}
       Workloads: ${{ variables.Workloads }}
       PublishFramework: ${{ variables.PublishFramework }}
       PublishProject: 'TestApp'
-      PublishRuntime: 'debian.8-x64'
+      PublishRuntime: 'osx-x64'
 
   - template: Publish-Bash.yml@templates
     parameters:
-      name: 'Publish_macOS_TestApp'
-      vmImage: 'macOS-11'
-      BuildConfiguration: ${{ variables.BuildConfiguration }}
-      Workloads: ${{ variables.Workloads }}
-      PublishFramework: ${{ variables.PublishFramework }}
-      PublishProject: 'TestApp'
-      PublishRuntime: 'osx.10.12-x64'
+        name: 'Publish_macOS_arm64'
+        vmImage: 'macOS-11'
+        BuildConfiguration: ${{ variables.BuildConfiguration }}
+        Workloads: ${{ variables.Workloads }}
+        PublishFramework: ${{ variables.PublishFramework }}
+        PublishProject: 'TestApp'
+        PublishRuntime: 'osx-arm64'