diff --git a/tests/azure/build-containers.yml b/tests/azure/build-containers.yml
index 1e5c7be9db2d05b0f398caeee1925265e04ebb82..0423dfd9c4779cd3c43ec0758936a6ea02b8bf9f 100644
--- a/tests/azure/build-containers.yml
+++ b/tests/azure/build-containers.yml
@@ -13,34 +13,49 @@ trigger: none
 pool:
   vmImage: 'ubuntu-20.04'
 
-jobs:
-
-- template: templates/build_container.yml
-  parameters:
-    job_name_suffix: Centos7
-    container_name: centos-7
-    build_scenario_name: centos-7-build
-
-- template: templates/build_container.yml
-  parameters:
-    job_name_suffix: C8S
-    container_name: c8s
-    build_scenario_name: c8s-build
-
-- template: templates/build_container.yml
-  parameters:
-    job_name_suffix: C9S
-    container_name: c9s
-    build_scenario_name: c9s-build
-
-- template: templates/build_container.yml
-  parameters:
-    job_name_suffix: FedoraLatest
-    container_name: fedora-latest
-    build_scenario_name: fedora-latest-build
-
-- template: templates/build_container.yml
-  parameters:
-    job_name_suffix: FedoraRawhide
-    container_name: fedora-rawhide
-    build_scenario_name: fedora-rawhide-build
+stages:
+
+- stage: CentOS_7
+  dependsOn: []
+  jobs:
+  - template: templates/build_container.yml
+    parameters:
+      job_name_suffix: Centos7
+      container_name: centos-7
+      build_scenario_name: centos-7-build
+
+- stage: CentOS_8_Stream
+  dependsOn: []
+  jobs:
+  - template: templates/build_container.yml
+    parameters:
+      job_name_suffix: C8S
+      container_name: c8s
+      build_scenario_name: c8s-build
+
+- stage: CentOS_9_Stream
+  dependsOn: []
+  jobs:
+  - template: templates/build_container.yml
+    parameters:
+      job_name_suffix: C9S
+      container_name: c9s
+      build_scenario_name: c9s-build
+
+- stage: Fedora_Latest
+  dependsOn: []
+  jobs:
+  - template: templates/build_container.yml
+    parameters:
+      job_name_suffix: FedoraLatest
+      container_name: fedora-latest
+      build_scenario_name: fedora-latest-build
+
+- stage: Fedora_Rawhide
+  dependsOn: []
+  jobs:
+  - template: templates/build_container.yml
+    parameters:
+      job_name_suffix: FedoraRawhide
+      container_name: fedora-rawhide
+      build_scenario_name: fedora-rawhide-build