diff --git a/devtools/containers/Dockerfile.centos8 b/devtools/containers/Dockerfile.centos8
index af7bf53b..aafdab33 100644
--- a/devtools/containers/Dockerfile.centos8
+++ b/devtools/containers/Dockerfile.centos8
@@ -1,4 +1,4 @@
-FROM registry.centos.org/centos:8
+FROM quay.io/centos/centos:stream8
 
 RUN \
   dnf -y update --nodocs --setopt=install_weak_deps=False && \
diff --git a/devtools/containers/Dockerfile.centos9 b/devtools/containers/Dockerfile.centos9
new file mode 100644
index 00000000..790fec6f
--- /dev/null
+++ b/devtools/containers/Dockerfile.centos9
@@ -0,0 +1,28 @@
+FROM quay.io/centos/centos:stream9
+
+RUN \
+  dnf -y update --nodocs --setopt=install_weak_deps=False && \
+  dnf install -y --nodocs --setopt=install_weak_deps=False epel-release && \
+  dnf install -y --nodocs --setopt=install_weak_deps=False --enablerepo crb \
+  'dnf-command(download)' \
+  gcc \
+  git \
+  glib2-devel \
+  glibc-langpack-en \
+  krb5-devel \
+  libffi-devel \
+  libxml2-devel \
+  make \
+  openssl-devel \
+  python3-devel \
+  python3-librepo \
+  python3-pip \
+  python3-pytest \
+  python3-rpm \
+  python3-tox \
+  redhat-rpm-config \
+  rpm-build \
+  rpm-devel \
+  sqlite-devel \
+  yum-utils && \
+  dnf clean all
diff --git a/devtools/containers/Dockerfile.f33 b/devtools/containers/Dockerfile.f35
similarity index 92%
rename from devtools/containers/Dockerfile.f33
rename to devtools/containers/Dockerfile.f35
index afc13f43..a7e78948 100644
--- a/devtools/containers/Dockerfile.f33
+++ b/devtools/containers/Dockerfile.f35
@@ -1,4 +1,4 @@
-FROM registry.fedoraproject.org/fedora:33
+FROM registry.fedoraproject.org/fedora:35
 RUN \
   dnf -y update --nodocs --setopt=install_weak_deps=False && \
   dnf install -y --nodocs --setopt=install_weak_deps=False \
diff --git a/devtools/containers/Dockerfile.f32 b/devtools/containers/Dockerfile.f36
similarity index 89%
rename from devtools/containers/Dockerfile.f32
rename to devtools/containers/Dockerfile.f36
index 5ede76bf..434e7293 100644
--- a/devtools/containers/Dockerfile.f32
+++ b/devtools/containers/Dockerfile.f36
@@ -1,4 +1,4 @@
-FROM registry.fedoraproject.org/fedora:32
+FROM registry.fedoraproject.org/fedora:36
 RUN \
   dnf -y update --nodocs --setopt=install_weak_deps=False && \
   dnf install -y --nodocs --setopt=install_weak_deps=False \
@@ -23,4 +23,4 @@ RUN \
   rpm-devel \
   sqlite-devel \
   yum-utils && \
-  dnf clean all
+  dnf clean all\