diff --git a/scripts/azure-pipelines-complete.yml b/scripts/azure-pipelines-complete.yml
index a0d34d84f5c..c7ba12876e1 100644
--- a/scripts/azure-pipelines-complete.yml
+++ b/scripts/azure-pipelines-complete.yml
@@ -25,18 +25,12 @@ parameters:
       pool:
         name: Azure Pipelines
         vmImage: windows-2022
-  - name: VM_IMAGE_MAC_NATIVE
-    type: object
-    default:
-      pool:
-        name: Azure Pipelines
-        vmImage: macos-11
   - name: VM_IMAGE_MAC
     type: object
     default:
       pool:
         name: Azure Pipelines
-        vmImage: macos-12
+        vmImage: macos-11
   - name: VM_IMAGE_LINUX
     type: object
     default:
@@ -60,6 +54,6 @@ stages:
       VM_IMAGE_WINDOWS: ${{ parameters.VM_IMAGE_WINDOWS }}
       VM_IMAGE_WINDOWS_NATIVE: ${{ parameters.VM_IMAGE_WINDOWS }}
       VM_IMAGE_MAC: ${{ parameters.VM_IMAGE_MAC }}
-      VM_IMAGE_MAC_NATIVE: ${{ parameters.VM_IMAGE_MAC_NATIVE }}
+      VM_IMAGE_MAC_NATIVE: ${{ parameters.VM_IMAGE_MAC }}
       VM_IMAGE_LINUX: ${{ parameters.VM_IMAGE_LINUX }}
       VM_IMAGE_LINUX_NATIVE: ${{ parameters.VM_IMAGE_LINUX }}
diff --git a/scripts/azure-templates-stages.yml b/scripts/azure-templates-stages.yml
index 07db687ae19..d81d702cd0e 100644
--- a/scripts/azure-templates-stages.yml
+++ b/scripts/azure-templates-stages.yml
@@ -774,9 +774,10 @@ stages:
           steps:
             - checkout: self
             - template: azure-templates-variables.yml
-            - template: azure-templates-github-status.yml
-              parameters:
-                state: 'pending'
+            - ${{ if ne(parameters.buildPipelineType, 'both') }}:
+              - template: azure-templates-github-status.yml
+                parameters:
+                  state: 'pending'
             - task: DownloadBuildArtifacts@0
               displayName: Download the coverage_netcore_windows artifact
               inputs:
@@ -797,7 +798,8 @@ stages:
               inputs:
                 codeCoverageTool: Cobertura
                 summaryFileLocation: 'output/**/Cobertura.xml'
-            - template: azure-templates-github-status.yml
+            - ${{ if ne(parameters.buildPipelineType, 'both') }}:
+              - template: azure-templates-github-status.yml
 
   - ${{ if ne(parameters.buildPipelineType, 'build') }}:
     - stage: samples