diff --git a/zuul-tests.d/container-roles-jobs.yaml b/zuul-tests.d/container-roles-jobs.yaml
index 7d49e987b..ea9a4f265 100644
--- a/zuul-tests.d/container-roles-jobs.yaml
+++ b/zuul-tests.d/container-roles-jobs.yaml
@@ -580,18 +580,6 @@
         - name: centos-8-stream
           label: centos-8-stream
 
-- job:
-    name: zuul-jobs-test-ensure-podman-fedora-36
-    description: Tests ensure-podman role on fedora-36
-    parent: zuul-jobs-test-ensure-podman
-    # Until non-root podman issues are sorted; see
-    #  https://github.com/containers/podman/issues/10717
-    voting: false
-    nodeset:
-      nodes:
-        - name: fedora-36
-          label: fedora-36
-
 - job:
     name: zuul-jobs-test-ensure-podman-ubuntu-bionic
     description: Tests ensure-podman role on ubuntu-bionic
@@ -610,15 +598,6 @@
         - name: debian-bullseye
           label: debian-bullseye
 
-- job:
-    name: zuul-jobs-test-ensure-skopeo-fedora-36
-    description: Tests ensure-skopeo role on fedora-36
-    parent: zuul-jobs-test-ensure-skopeo
-    nodeset:
-      nodes:
-        - name: fedora-36
-          label: fedora-36
-
 # -* AUTOGENERATED *-
 #  The following project section is autogenerated by
 #    tox -e update-test-platforms
@@ -626,44 +605,6 @@
 
 - project:
     check:
-      jobs:
-        - zuul-jobs-test-ensure-docker-centos-7
-        - zuul-jobs-test-ensure-docker-centos-8-stream
-        - zuul-jobs-test-ensure-docker-centos-9-stream
-        - zuul-jobs-test-ensure-docker-debian-bookworm
-        - zuul-jobs-test-ensure-docker-debian-bullseye
-        - zuul-jobs-test-ensure-docker-debian-buster
-        - zuul-jobs-test-ensure-docker-ubuntu-bionic
-        - zuul-jobs-test-ensure-docker-ubuntu-focal
-        - zuul-jobs-test-ensure-docker-ubuntu-jammy
-        - zuul-jobs-test-build-container-image-docker-release
-        - zuul-jobs-test-build-container-image-docker-release-multiarch
-        - zuul-jobs-test-build-container-image-podman-release
-        - zuul-jobs-test-build-container-image-docker-promote
-        - zuul-jobs-test-build-container-image-docker-promote-multiarch
-        - zuul-jobs-test-build-container-image-podman-promote
-        - zuul-jobs-test-build-docker-image-release
-        - zuul-jobs-test-build-docker-image-release-multiarch
-        - zuul-jobs-test-registry-docker
-        - zuul-jobs-test-registry-docker-multiarch
-        - zuul-jobs-test-registry-podman
-        - zuul-jobs-test-registry-buildset-registry
-        - zuul-jobs-test-registry-buildset-registry-k8s-crio
-        - zuul-jobs-test-registry-buildset-registry-openshift-docker
-        - zuul-jobs-test-registry-buildset-registry-k8s-microk8s
-        - zuul-jobs-test-ensure-kubernetes-crio-ubuntu-bionic
-        - zuul-jobs-test-ensure-kubernetes-crio-ubuntu-focal
-        - zuul-jobs-test-ensure-kubernetes-crio-ubuntu-jammy
-        - zuul-jobs-test-ensure-kubernetes-microk8s-ubuntu-jammy
-        - zuul-jobs-test-ensure-skopeo-ubuntu-bionic
-        - zuul-jobs-test-ensure-skopeo-ubuntu-focal
-        - zuul-jobs-test-ensure-skopeo-ubuntu-jammy
-        - zuul-jobs-test-ensure-podman-centos-8-stream
-        - zuul-jobs-test-ensure-podman-fedora-36
-        - zuul-jobs-test-ensure-podman-ubuntu-bionic
-        - zuul-jobs-test-ensure-podman-debian-bullseye
-        - zuul-jobs-test-ensure-skopeo-fedora-36
-    gate:
       jobs: &id001
         - zuul-jobs-test-ensure-docker-centos-7
         - zuul-jobs-test-ensure-docker-centos-8-stream
@@ -699,6 +640,7 @@
         - zuul-jobs-test-ensure-podman-centos-8-stream
         - zuul-jobs-test-ensure-podman-ubuntu-bionic
         - zuul-jobs-test-ensure-podman-debian-bullseye
-        - zuul-jobs-test-ensure-skopeo-fedora-36
+    gate:
+      jobs: *id001
     periodic-weekly:
       jobs: *id001