diff --git a/.azure-pipelines/main.yml b/.azure-pipelines/main.yml
index 4daeb13a2..628db56ac 100644
--- a/.azure-pipelines/main.yml
+++ b/.azure-pipelines/main.yml
@@ -4,4 +4,5 @@ pr:
   - '*.x'
 
 jobs:
+  # TODO: revert to templates/jobs/standard-tests-jobs.yml
   - template: templates/jobs/packaging-jobs.yml
diff --git a/.azure-pipelines/templates/jobs/packaging-jobs.yml b/.azure-pipelines/templates/jobs/packaging-jobs.yml
index 063bf81e5..1e993c71c 100644
--- a/.azure-pipelines/templates/jobs/packaging-jobs.yml
+++ b/.azure-pipelines/templates/jobs/packaging-jobs.yml
@@ -64,8 +64,7 @@ jobs:
         amd64:
           ARCH: amd64
         # Do not run the QEMU jobs for the full-test-suite pipeline
-        # TODO: currently set to pr-test-suite for dev purpose, must be set back to 4
-        ${{ if ne(variables['System.DefinitionId'], 1 )}}:
+        ${{ if ne(variables['System.DefinitionId'], 4 )}}:
           arm64:
             ARCH: arm64
           armhf:
@@ -88,8 +87,7 @@ jobs:
         amd64:
           ARCH: amd64
         # Do not run the QEMU jobs for the full-test-suite pipeline
-        # TODO: currently set to pr-test-suite for dev purpose, must be set back to 4
-        ${{ if ne(variables['System.DefinitionId'], 1 )}}:
+        ${{ if ne(variables['System.DefinitionId'], 4 )}}:
           arm64:
             ARCH: arm64
           armhf:
diff --git a/.azure-pipelines/templates/stages/deploy-stage.yml b/.azure-pipelines/templates/stages/deploy-stage.yml
index 1a6dbcad0..407341157 100644
--- a/.azure-pipelines/templates/stages/deploy-stage.yml
+++ b/.azure-pipelines/templates/stages/deploy-stage.yml
@@ -32,6 +32,11 @@ stages:
               artifact: snap-$(arch)
               path: $(Build.SourcesDirectory)/snap
             displayName: Retrieve Certbot snap
+          - task: DownloadPipelineArtifact@2
+            inputs:
+              artifact: dns-snap-$(arch)
+              path: $(Build.SourcesDirectory)/snap
+            displayName: Retrieve DNS plugins snaps
           - task: DownloadSecureFile@1
             name: snapcraftCfg
             inputs: