diff --git a/infra/azure/azure-pipelines.yml b/infra/azure/azure-pipelines.yml
index 4cd2419920..574cf8ec28 100644
--- a/infra/azure/azure-pipelines.yml
+++ b/infra/azure/azure-pipelines.yml
@@ -3,7 +3,7 @@ trigger:
 - master
 
 pool:
-  vmImage: 'ubuntu-22.04'
+  vmImage: 'ubuntu-24.04'
 
 stages:
 
diff --git a/infra/azure/build-containers.yml b/infra/azure/build-containers.yml
index d4b6b25abd..a98b2e1100 100644
--- a/infra/azure/build-containers.yml
+++ b/infra/azure/build-containers.yml
@@ -11,7 +11,7 @@ schedules:
 trigger: none
 
 pool:
-  vmImage: 'ubuntu-22.04'
+  vmImage: 'ubuntu-24.04'
 
 stages:
 
@@ -33,6 +33,14 @@ stages:
       job_name_suffix: C9S
       distro: c9s
 
+- stage: CentOS_10_Stream
+  dependsOn: []
+  jobs:
+  - template: templates/build_container.yml
+    parameters:
+      job_name_suffix: C10S
+      distro: c10s
+
 - stage: Fedora_Latest
   dependsOn: []
   jobs:
diff --git a/infra/azure/nightly.yml b/infra/azure/nightly.yml
index a76c6c0330..882d97d103 100644
--- a/infra/azure/nightly.yml
+++ b/infra/azure/nightly.yml
@@ -10,7 +10,7 @@ schedules:
 trigger: none
 
 pool:
-  vmImage: 'ubuntu-22.04'
+  vmImage: 'ubuntu-24.04'
 
 stages:
 
diff --git a/infra/azure/pr-pipeline.yml b/infra/azure/pr-pipeline.yml
index a590844a6e..8abca704f3 100644
--- a/infra/azure/pr-pipeline.yml
+++ b/infra/azure/pr-pipeline.yml
@@ -3,7 +3,7 @@ trigger:
 - master
 
 pool:
-  vmImage: 'ubuntu-22.04'
+  vmImage: 'ubuntu-24.04'
 
 stages:
 
diff --git a/infra/image/build.sh b/infra/image/build.sh
index 6da8179191..c1635cd55c 100755
--- a/infra/image/build.sh
+++ b/infra/image/build.sh
@@ -37,7 +37,7 @@ EOF
 name="ansible-freeipa-image-builder"
 hostname="ipaserver.test.local"
 # Number of cpus is not available in usptream CI (Ubuntu 22.04).
-# cpus="2"
+cpus="2"
 memory="3g"
 quayname="quay.io/ansible-freeipa/upstream-tests"
 deploy_server="N"