diff --git a/browbeat-containers/collectd-baremetal/Dockerfile b/browbeat-containers/collectd-baremetal/Dockerfile
index 6c8670a01..50908fda7 100644
--- a/browbeat-containers/collectd-baremetal/Dockerfile
+++ b/browbeat-containers/collectd-baremetal/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.centos.org/centos:8
+FROM quay.io/centos/centos:stream8
 
 RUN dnf update -y && \
     dnf clean all && \
diff --git a/browbeat-containers/collectd-guest/Dockerfile b/browbeat-containers/collectd-guest/Dockerfile
index 14d6c3cd7..2359c20b8 100644
--- a/browbeat-containers/collectd-guest/Dockerfile
+++ b/browbeat-containers/collectd-guest/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.centos.org/centos:8
+FROM quay.io/centos/centos:stream8
 
 RUN dnf update -y && \
     dnf clean all && \
diff --git a/browbeat-containers/collectd-openstack/Dockerfile b/browbeat-containers/collectd-openstack/Dockerfile
index 3c0b5d8ac..fe50d2372 100644
--- a/browbeat-containers/collectd-openstack/Dockerfile
+++ b/browbeat-containers/collectd-openstack/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.centos.org/centos:8
+FROM quay.io/centos/centos:stream8
 
 RUN dnf clean all && \
     dnf group install -y "Development Tools" && \
@@ -11,7 +11,8 @@ RUN dnf clean all && \
     pip3 install --upgrade pip && \
     pip3 install pyrabbit && \
     dnf install -y libdbi-dbd-mysql collectd-dbi && \
-    dnf install -y centos-release-openstack-train && \
+    dnf install -y centos-release-openstack-ussuri && \
+    dnf config-manager --set-enabled powertools && \
     dnf install -y openvswitch libibverbs && \
     dnf install -y passwd && \
     dnf install -y ceph-common && \