diff --git a/.azure-pipelines/templates/jobs/packaging-jobs.yml b/.azure-pipelines/templates/jobs/packaging-jobs.yml
index 5a1318d16..0ec9cdfd9 100644
--- a/.azure-pipelines/templates/jobs/packaging-jobs.yml
+++ b/.azure-pipelines/templates/jobs/packaging-jobs.yml
@@ -1,5 +1,5 @@
 parameters:
-  snaps: ["certbot", "certbot-dns-cloudflare"]
+  snaps: ["certbot", "certbot-dns-cloudflare", "certbot-dns-cloudxns", "certbot-dns-digitalocean", "certbot-dns-dnsimple", "certbot-dns-dnsmadeeasy", "certbot-dns-gehirn", "certbot-dns-google", "certbot-dns-linode", "certbot-dns-luadns", "certbot-dns-nsone", "certbot-dns-ovh", "certbot-dns-rfc2136", "certbot-dns-route53", "certbot-dns-sakuracloud"]
 
 jobs:
   - job: docker_build
@@ -117,36 +117,36 @@ jobs:
           set PATH=%ProgramFiles%\Certbot\bin;%PATH%
           venv\Scripts\python -m pytest certbot-ci\certbot_integration_tests\certbot_tests -n 4
         displayName: Run certbot integration tests
-  - ${{ each snapName in parameters.snaps }}:
-    - job: snaps_build_${{ replace(snapName, '-', '_') }}
-      pool:
-        vmImage: ubuntu-18.04
-      strategy:
-        matrix:
-            amd64:
-              SNAP_ARCH: amd64
-            # Do not run the heavy non-amd64 builds for test branches
-            ${{ if not(startsWith(variables['Build.SourceBranchName'], 'test-')) }}:
-              armhf:
-                SNAP_ARCH: armhf
-              arm64:
-                SNAP_ARCH: arm64
-      timeoutInMinutes: 0
-      steps:
-        - script: |
-            set -e
-            sudo apt-get update
-            sudo apt-get install -y --no-install-recommends snapd
-            sudo snap install --classic snapcraft
-          displayName: Install dependencies
-        - task: UsePythonVersion@0
-          inputs:
-            versionSpec: 3.8
-            addToPath: true
-        - task: DownloadSecureFile@1
-          name: credentials
-          inputs:
-            secureFile: launchpad-credentials
+  - job: snaps_build
+    pool:
+      vmImage: ubuntu-18.04
+    strategy:
+      matrix:
+          amd64:
+            SNAP_ARCH: amd64
+          # Do not run the heavy non-amd64 builds for test branches
+          ${{ if not(startsWith(variables['Build.SourceBranchName'], 'test-')) }}:
+            armhf:
+              SNAP_ARCH: armhf
+            arm64:
+              SNAP_ARCH: arm64
+    timeoutInMinutes: 0
+    steps:
+      - script: |
+          set -e
+          sudo apt-get update
+          sudo apt-get install -y --no-install-recommends snapd
+          sudo snap install --classic snapcraft
+        displayName: Install dependencies
+      - task: UsePythonVersion@0
+        inputs:
+          versionSpec: 3.8
+          addToPath: true
+      - task: DownloadSecureFile@1
+        name: credentials
+        inputs:
+          secureFile: launchpad-credentials
+      - ${{ each snapName in parameters.snaps }}:
         - script: |
             set -e
             git config --global user.email "$(Build.RequestedForEmail)"
@@ -155,16 +155,16 @@ jobs:
             cp $(credentials.secureFilePath) ~/.local/share/snapcraft/provider/launchpad/credentials
             python3 tools/snap/build_remote.py ${{ snapName }} --archs ${SNAP_ARCH} --timeout $(snapBuildTimeout)
           displayName: Build ${{ snapName }}
-        - script: |
-            set -e
-            mv *.snap $(Build.ArtifactStagingDirectory)
-            mv certbot-dns-*/*.snap $(Build.ArtifactStagingDirectory)
-          displayName: Prepare artifacts
-        - task: PublishPipelineArtifact@1
-          inputs:
-            path: $(Build.ArtifactStagingDirectory)
-            artifact: snaps_$(SNAP_ARCH)
-          displayName: Store snaps artifacts
+      - script: |
+          set -e
+          mv *.snap $(Build.ArtifactStagingDirectory)
+          mv certbot-dns-*/*.snap $(Build.ArtifactStagingDirectory)
+        displayName: Prepare artifacts
+      - task: PublishPipelineArtifact@1
+        inputs:
+          path: $(Build.ArtifactStagingDirectory)
+          artifact: snaps_$(SNAP_ARCH)
+        displayName: Store snaps artifacts
   - job: snap_run
     dependsOn: snaps_build
     pool: