diff --git a/roles/build-container-image/tasks/build.yaml b/roles/build-container-image/tasks/build.yaml
index 37ebbfb15..e1bcd21ee 100644
--- a/roles/build-container-image/tasks/build.yaml
+++ b/roles/build-container-image/tasks/build.yaml
@@ -34,6 +34,9 @@
     tag_prefix: "{{ ('change_' + zuul.change) if (zuul.change is defined) else zuul.pipeline }}_"
   command: >-
     {{ container_command }} build {{ zj_image.path | default('.') }} {% if containerfile %}-f {{ containerfile }}{% endif %}
+    {% if container_command == 'podman' -%}
+      --cgroup-manager cgroupfs
+    {% endif -%}
     {% if zj_image.target | default(false) -%}
       --target {{ zj_image.target }}
     {% endif -%}
diff --git a/zuul-tests.d/container-roles-jobs.yaml b/zuul-tests.d/container-roles-jobs.yaml
index f7cccc6ce..ff9dd478b 100644
--- a/zuul-tests.d/container-roles-jobs.yaml
+++ b/zuul-tests.d/container-roles-jobs.yaml
@@ -126,7 +126,7 @@
     nodeset:
       nodes:
         - name: builder
-          label: ubuntu-bionic
+          label: ubuntu-jammy
 
 - job:
     name: zuul-jobs-test-build-docker-image-release
@@ -151,7 +151,7 @@
     nodeset:
       nodes:
         - name: builder
-          label: ubuntu-bionic
+          label: ubuntu-jammy
 
 - job:
     name: zuul-jobs-test-build-docker-image-release-multiarch
@@ -255,11 +255,11 @@
     nodeset:
       nodes:
         - name: intermediate-registry
-          label: ubuntu-bionic
+          label: ubuntu-jammy
         - name: executor
-          label: ubuntu-bionic
+          label: ubuntu-jammy
         - name: builder
-          label: ubuntu-bionic
+          label: ubuntu-jammy
 
 - job:
     name: zuul-jobs-test-registry-buildset-registry