diff --git a/.azure-pipelines/templates/jobs/packaging-jobs.yml b/.azure-pipelines/templates/jobs/packaging-jobs.yml
index b0c7998cb..c4cbba875 100644
--- a/.azure-pipelines/templates/jobs/packaging-jobs.yml
+++ b/.azure-pipelines/templates/jobs/packaging-jobs.yml
@@ -99,7 +99,7 @@ jobs:
       ${{ if not(startsWith(variables['Build.SourceBranchName'], 'test-')) }}:
         ARCHS: amd64 arm64 armhf
       ${{ if startsWith(variables['Build.SourceBranchName'], 'test-') }}:
-        ARCHS: amd64
+        ARCHS: amd64 arm64 armhf
     steps:
       - script: |
           sudo apt-get update
diff --git a/.azure-pipelines/templates/stages/test-and-package-stage.yml b/.azure-pipelines/templates/stages/test-and-package-stage.yml
index 26010644d..866bf804b 100644
--- a/.azure-pipelines/templates/stages/test-and-package-stage.yml
+++ b/.azure-pipelines/templates/stages/test-and-package-stage.yml
@@ -1,6 +1,6 @@
 stages:
   - stage: TestAndPackage
     jobs:
-      - template: ../jobs/standard-tests-jobs.yml
-      - template: ../jobs/extended-tests-jobs.yml
+      # - template: ../jobs/standard-tests-jobs.yml
+      # - template: ../jobs/extended-tests-jobs.yml
       - template: ../jobs/packaging-jobs.yml