diff --git a/.github/workflows/comment-on-pr.yml b/.github/workflows/comment-on-pr.yml
index 5c627cae37..5452343649 100644
--- a/.github/workflows/comment-on-pr.yml
+++ b/.github/workflows/comment-on-pr.yml
@@ -4,7 +4,7 @@ on:
   repository_dispatch:
     types: comment-pr
 
-concurrency: ${{ github.event.repository.name }}-${{ github.event.client_payload.pr_number }}
+concurrency: ${{ github.event.repository.name }}-${{ github.ref }}
 
 jobs:
   comment-on-pr:
diff --git a/.github/workflows/macosx-clang-mpich.yml b/.github/workflows/macosx-clang-mpich.yml
index e1906ca604..9503e1fc0e 100644
--- a/.github/workflows/macosx-clang-mpich.yml
+++ b/.github/workflows/macosx-clang-mpich.yml
@@ -7,13 +7,18 @@ on:
       - develop
       - 1.*
   pull_request:
+    types: [opened, reopened, synchronize, converted_to_draft, ready_for_review]
 
-jobs:
+concurrency:
+  group: ${{ github.event.repository.name }}-${{ github.ref }}-${{ github.workflow }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
+jobs:
   build:
-
     runs-on: macos-10.15
 
+    if: github.event.pull_request.draft == false
+
     strategy:
       fail-fast: false
 
@@ -28,34 +33,34 @@ jobs:
       CMAKE_BUILD_PARALLEL_LEVEL: 4
 
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/cache@v2
-      with:
-        path: ~/.ccache
-        key: ${{ runner.os }}-macosx-clang-8-ccache-${{ secrets.GH_ACTIONS_CACHE_VERSION }}-${{ hashFiles('**/*') }}
-        restore-keys: |
-          ${{ runner.os }}-macosx-clang-8-ccache-${{ secrets.GH_ACTIONS_CACHE_VERSION }}
-    - uses: actions/cache@v2
-      id: mpich-cache
-      with:
-        path: ~/.mpich
-        key: ${{ runner.os }}-macosx-clang-8-mpich-${{ hashFiles('**/.github/workflows/macosx-clang-mpich.yml', '**/ci/deps/mpich.sh') }}
-    - name: Install Dependencies
-      shell: bash
-      run: brew bundle --file=ci/Brewfile
-    - name: Modify hosts file
-      shell: bash
-      run: echo "127.0.0.1 $(hostname)" | sudo tee -a /etc/hosts
-    - name: Build mpich
-      if: steps.mpich-cache.outputs.cache-hit != 'true'
-      shell: bash
-      run: |
-        ci/deps/mpich.sh 3.3.2 -j4 $(grealpath ~/.mpich)
-    - name: Build
-      shell: bash
-      run: |
-        PATH=~/.mpich/bin:$PATH ci/build_cpp.sh $(pwd) $(pwd)/build
-    - name: Test
-      shell: bash
-      run: |
-        PATH=~/.mpich/bin:$PATH ci/test_cpp.sh $(pwd) $(pwd)/build
+      - uses: actions/checkout@v2
+      - uses: actions/cache@v2
+        with:
+          path: ~/.ccache
+          key: ${{ runner.os }}-macosx-clang-8-ccache-${{ secrets.GH_ACTIONS_CACHE_VERSION }}-${{ hashFiles('**/*') }}
+          restore-keys: |
+            ${{ runner.os }}-macosx-clang-8-ccache-${{ secrets.GH_ACTIONS_CACHE_VERSION }}
+      - uses: actions/cache@v2
+        id: mpich-cache
+        with:
+          path: ~/.mpich
+          key: ${{ runner.os }}-macosx-clang-8-mpich-${{ hashFiles('**/.github/workflows/macosx-clang-mpich.yml', '**/ci/deps/mpich.sh') }}
+      - name: Install Dependencies
+        shell: bash
+        run: brew bundle --file=ci/Brewfile
+      - name: Modify hosts file
+        shell: bash
+        run: echo "127.0.0.1 $(hostname)" | sudo tee -a /etc/hosts
+      - name: Build mpich
+        if: steps.mpich-cache.outputs.cache-hit != 'true'
+        shell: bash
+        run: |
+          ci/deps/mpich.sh 3.3.2 -j4 $(grealpath ~/.mpich)
+      - name: Build
+        shell: bash
+        run: |
+          PATH=~/.mpich/bin:$PATH ci/build_cpp.sh $(pwd) $(pwd)/build
+      - name: Test
+        shell: bash
+        run: |
+          PATH=~/.mpich/bin:$PATH ci/test_cpp.sh $(pwd) $(pwd)/build
diff --git a/ci/azure/azure-clang-10-ubuntu-mpich.yml b/ci/azure/azure-clang-10-ubuntu-mpich.yml
index 69f7d6560a..fa93bbba94 100644
--- a/ci/azure/azure-clang-10-ubuntu-mpich.yml
+++ b/ci/azure/azure-clang-10-ubuntu-mpich.yml
@@ -11,9 +11,11 @@ trigger:
       - 1.0.0*
 
 pr:
+  drafts: false
+  autoCancel: true
   branches:
-   include:
-     - '*'
+    include:
+      - '*'
 
 
 resources:
diff --git a/ci/azure/azure-clang-11-ubuntu-mpich.yml b/ci/azure/azure-clang-11-ubuntu-mpich.yml
index 26882a6e9b..6b5bb0df1d 100644
--- a/ci/azure/azure-clang-11-ubuntu-mpich.yml
+++ b/ci/azure/azure-clang-11-ubuntu-mpich.yml
@@ -11,9 +11,11 @@ trigger:
       - 1.0.0*
 
 pr:
+  drafts: false
+  autoCancel: true
   branches:
-   include:
-     - '*'
+    include:
+      - '*'
 
 
 resources:
diff --git a/ci/azure/azure-clang-12-ubuntu-mpich.yml b/ci/azure/azure-clang-12-ubuntu-mpich.yml
index 47a1ae62bd..492d63ce72 100644
--- a/ci/azure/azure-clang-12-ubuntu-mpich.yml
+++ b/ci/azure/azure-clang-12-ubuntu-mpich.yml
@@ -11,9 +11,11 @@ trigger:
       - 1.0.0*
 
 pr:
+  drafts: false
+  autoCancel: true
   branches:
-   include:
-     - '*'
+    include:
+      - '*'
 
 
 resources:
diff --git a/ci/azure/azure-clang-13-ubuntu-mpich.yml b/ci/azure/azure-clang-13-ubuntu-mpich.yml
index 364c7aab8e..fc48854ef3 100644
--- a/ci/azure/azure-clang-13-ubuntu-mpich.yml
+++ b/ci/azure/azure-clang-13-ubuntu-mpich.yml
@@ -11,9 +11,11 @@ trigger:
       - 1.0.0*
 
 pr:
+  drafts: false
+  autoCancel: true
   branches:
-   include:
-     - '*'
+    include:
+      - '*'
 
 
 resources:
diff --git a/ci/azure/azure-clang-14-ubuntu-mpich.yml b/ci/azure/azure-clang-14-ubuntu-mpich.yml
index 2cee722d4f..6c0aac225c 100644
--- a/ci/azure/azure-clang-14-ubuntu-mpich.yml
+++ b/ci/azure/azure-clang-14-ubuntu-mpich.yml
@@ -11,9 +11,11 @@ trigger:
       - 1.0.0*
 
 pr:
+  drafts: false
+  autoCancel: true
   branches:
-   include:
-     - '*'
+    include:
+      - '*'
 
 
 resources:
diff --git a/ci/azure/azure-clang-3.9-ubuntu-mpich.yml b/ci/azure/azure-clang-3.9-ubuntu-mpich.yml
index 6e90aa4b65..5b16a5ca95 100644
--- a/ci/azure/azure-clang-3.9-ubuntu-mpich.yml
+++ b/ci/azure/azure-clang-3.9-ubuntu-mpich.yml
@@ -11,9 +11,11 @@ trigger:
       - 1.0.0*
 
 pr:
+  drafts: false
+  autoCancel: true
   branches:
-   include:
-     - '*'
+    include:
+      - '*'
 
 
 resources:
diff --git a/ci/azure/azure-clang-5.0-ubuntu-mpich.yml b/ci/azure/azure-clang-5.0-ubuntu-mpich.yml
index bef572bfc0..daf0d10ca3 100644
--- a/ci/azure/azure-clang-5.0-ubuntu-mpich.yml
+++ b/ci/azure/azure-clang-5.0-ubuntu-mpich.yml
@@ -11,9 +11,11 @@ trigger:
       - 1.0.0*
 
 pr:
+  drafts: false
+  autoCancel: true
   branches:
-   include:
-     - '*'
+    include:
+      - '*'
 
 
 resources:
diff --git a/ci/azure/azure-clang-9-ubuntu-mpich.yml b/ci/azure/azure-clang-9-ubuntu-mpich.yml
index fc6bcac5e8..1b3a535880 100644
--- a/ci/azure/azure-clang-9-ubuntu-mpich.yml
+++ b/ci/azure/azure-clang-9-ubuntu-mpich.yml
@@ -11,9 +11,11 @@ trigger:
       - 1.0.0*
 
 pr:
+  drafts: false
+  autoCancel: true
   branches:
-   include:
-     - '*'
+    include:
+      - '*'
 
 
 resources:
diff --git a/ci/azure/azure-clang-alpine-mpich.yml b/ci/azure/azure-clang-alpine-mpich.yml
index 2d7ad934c5..eda14c8a5f 100644
--- a/ci/azure/azure-clang-alpine-mpich.yml
+++ b/ci/azure/azure-clang-alpine-mpich.yml
@@ -11,9 +11,11 @@ trigger:
       - 1.0.0*
 
 pr:
+  drafts: false
+  autoCancel: true
   branches:
-   include:
-     - '*'
+    include:
+      - '*'
 
 
 resources:
diff --git a/ci/azure/azure-gcc-10-ubuntu-openmpi.yml b/ci/azure/azure-gcc-10-ubuntu-openmpi.yml
index f57abea621..f4d0c66901 100644
--- a/ci/azure/azure-gcc-10-ubuntu-openmpi.yml
+++ b/ci/azure/azure-gcc-10-ubuntu-openmpi.yml
@@ -11,9 +11,11 @@ trigger:
       - 1.0.0*
 
 pr:
+  drafts: false
+  autoCancel: true
   branches:
-   include:
-     - '*'
+    include:
+      - '*'
 
 
 resources:
diff --git a/ci/azure/azure-gcc-11-ubuntu-mpich.yml b/ci/azure/azure-gcc-11-ubuntu-mpich.yml
index 27fb5b2b00..45b2dbbfb0 100644
--- a/ci/azure/azure-gcc-11-ubuntu-mpich.yml
+++ b/ci/azure/azure-gcc-11-ubuntu-mpich.yml
@@ -11,9 +11,11 @@ trigger:
       - 1.0.0*
 
 pr:
+  drafts: false
+  autoCancel: true
   branches:
-   include:
-     - '*'
+    include:
+      - '*'
 
 
 resources:
diff --git a/ci/azure/azure-gcc-12-ubuntu-mpich.yml b/ci/azure/azure-gcc-12-ubuntu-mpich.yml
index 4095a24693..93a763666d 100644
--- a/ci/azure/azure-gcc-12-ubuntu-mpich.yml
+++ b/ci/azure/azure-gcc-12-ubuntu-mpich.yml
@@ -11,9 +11,11 @@ trigger:
       - 1.0.0*
 
 pr:
+  drafts: true
+  autoCancel: true
   branches:
-   include:
-     - '*'
+    include:
+      - '*'
 
 
 resources:
diff --git a/ci/azure/azure-gcc-5-ubuntu-mpich.yml b/ci/azure/azure-gcc-5-ubuntu-mpich.yml
index e74b0b2874..219e56caf3 100644
--- a/ci/azure/azure-gcc-5-ubuntu-mpich.yml
+++ b/ci/azure/azure-gcc-5-ubuntu-mpich.yml
@@ -11,9 +11,11 @@ trigger:
       - 1.0.0*
 
 pr:
+  drafts: false
+  autoCancel: true
   branches:
-   include:
-     - '*'
+    include:
+      - '*'
 
 
 resources:
diff --git a/ci/azure/azure-gcc-6-ubuntu-mpich.yml b/ci/azure/azure-gcc-6-ubuntu-mpich.yml
index 927349e04f..7bd9be1e70 100644
--- a/ci/azure/azure-gcc-6-ubuntu-mpich.yml
+++ b/ci/azure/azure-gcc-6-ubuntu-mpich.yml
@@ -11,9 +11,11 @@ trigger:
       - 1.0.0*
 
 pr:
+  drafts: false
+  autoCancel: true
   branches:
-   include:
-     - '*'
+    include:
+      - '*'
 
 
 resources:
diff --git a/ci/azure/azure-gcc-7-ubuntu-mpich.yml b/ci/azure/azure-gcc-7-ubuntu-mpich.yml
index 2949c46cb5..5187afb744 100644
--- a/ci/azure/azure-gcc-7-ubuntu-mpich.yml
+++ b/ci/azure/azure-gcc-7-ubuntu-mpich.yml
@@ -11,9 +11,11 @@ trigger:
       - 1.0.0*
 
 pr:
+  drafts: false
+  autoCancel: true
   branches:
-   include:
-     - '*'
+    include:
+      - '*'
 
 
 resources:
diff --git a/ci/azure/azure-gcc-8-ubuntu-mpich.yml b/ci/azure/azure-gcc-8-ubuntu-mpich.yml
index 1f1581af47..a7c11c50f2 100644
--- a/ci/azure/azure-gcc-8-ubuntu-mpich.yml
+++ b/ci/azure/azure-gcc-8-ubuntu-mpich.yml
@@ -11,9 +11,11 @@ trigger:
       - 1.0.0*
 
 pr:
+  drafts: false
+  autoCancel: true
   branches:
-   include:
-     - '*'
+    include:
+      - '*'
 
 
 resources:
diff --git a/ci/azure/azure-gcc-9-ubuntu-mpich.yml b/ci/azure/azure-gcc-9-ubuntu-mpich.yml
index 9f917f8ad6..e6b73d6a83 100644
--- a/ci/azure/azure-gcc-9-ubuntu-mpich.yml
+++ b/ci/azure/azure-gcc-9-ubuntu-mpich.yml
@@ -11,9 +11,11 @@ trigger:
       - 1.0.0*
 
 pr:
+  drafts: false
+  autoCancel: true
   branches:
-   include:
-     - '*'
+    include:
+      - '*'
 
 
 resources:
diff --git a/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml b/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml
index aeb2c50613..ec35af3ceb 100644
--- a/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml
+++ b/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml
@@ -11,9 +11,11 @@ trigger:
       - 1.0.0*
 
 pr:
+  drafts: false
+  autoCancel: true
   branches:
-   include:
-     - '*'
+    include:
+      - '*'
 
 
 resources:
diff --git a/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml b/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml
index 55cc84b164..4fee8c1f6d 100644
--- a/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml
+++ b/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml
@@ -11,9 +11,11 @@ trigger:
       - 1.0.0*
 
 pr:
+  drafts: false
+  autoCancel: true
   branches:
-   include:
-     - '*'
+    include:
+      - '*'
 
 
 resources:
diff --git a/ci/azure/azure-nvidia-10-ubuntu-mpich.yml b/ci/azure/azure-nvidia-10-ubuntu-mpich.yml
index e3a5dfe139..3c4b2f5f44 100644
--- a/ci/azure/azure-nvidia-10-ubuntu-mpich.yml
+++ b/ci/azure/azure-nvidia-10-ubuntu-mpich.yml
@@ -11,9 +11,11 @@ trigger:
       - 1.0.0*
 
 pr:
+  drafts: false
+  autoCancel: true
   branches:
-   include:
-     - '*'
+    include:
+      - '*'
 
 
 resources:
diff --git a/ci/azure/azure-nvidia-11-ubuntu-mpich.yml b/ci/azure/azure-nvidia-11-ubuntu-mpich.yml
index 7ca9863f2d..f84ad90372 100644
--- a/ci/azure/azure-nvidia-11-ubuntu-mpich.yml
+++ b/ci/azure/azure-nvidia-11-ubuntu-mpich.yml
@@ -11,9 +11,11 @@ trigger:
       - 1.0.0*
 
 pr:
+  drafts: false
+  autoCancel: true
   branches:
-   include:
-     - '*'
+    include:
+      - '*'
 
 
 resources:
diff --git a/scripts/workflows-azure.ini b/scripts/workflows-azure.ini
index ebaace966e..3bc5ee796b 100644
--- a/scripts/workflows-azure.ini
+++ b/scripts/workflows-azure.ini
@@ -37,7 +37,7 @@ workflow_runs_on = "vmImage: 'ubuntu-18.04'"
 build_root = $(ARCH)-[% linux %]-$(UBUNTU)-$(COMPILER)-cache
 linux_env = "  UBUNTU: [% distro %]"
 vt_diagnostics = 1
-pr_pattern = "pr:\\n  branches:\\n   include:\\n     - '*'\\n"
+pr_pattern = "pr:\\n  drafts: false\\n  autoCancel: true\\n  branches:\\n    include:\\n      - '*'\\n"
 job_setup = "echo setup"
 vt_no_color = 1
 vt_build_shared_libs = 0
@@ -160,6 +160,7 @@ compiler_type = gnu
 compiler = gcc-12
 distro = 22.04
 output_name = ci/azure/azure-gcc-12-ubuntu-mpich.yml
+pr_pattern = "pr:\\n  drafts: true\\n  autoCancel: true\\n  branches:\\n    include:\\n      - '*'\\n"
 
 [PR-tests-clang-39]
 test_configuration = "clang-3.9, ubuntu, mpich"