diff --git a/infra/azure/azure-pipelines.yml b/infra/azure/azure-pipelines.yml
index 4cd241992..72e4a90d2 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-20.04'
 
 stages:
 
diff --git a/infra/azure/build-containers.yml b/infra/azure/build-containers.yml
index d4b6b25ab..3ee382b39 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-20.04'
 
 stages:
 
diff --git a/infra/azure/nightly.yml b/infra/azure/nightly.yml
index a76c6c033..eeed7fa58 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-20.04'
 
 stages:
 
diff --git a/infra/azure/pr-pipeline.yml b/infra/azure/pr-pipeline.yml
index a590844a6..29ff8af30 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-20.04'
 
 stages:
 
diff --git a/infra/image/build.sh b/infra/image/build.sh
index 6da817919..7ee65d618 100755
--- a/infra/image/build.sh
+++ b/infra/image/build.sh
@@ -36,8 +36,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"