diff --git a/Makefile b/Makefile
index 66eb8944..740cb156 100644
--- a/Makefile
+++ b/Makefile
@@ -41,6 +41,7 @@ test-cci-export:
 collector-image:
 	$(DOCKER) build \
 		-t quay.io/$(QUAY_REPO)/apollo-ci:$(shell scripts/get_tag.sh "collector") \
+		--build-arg STACKROX_CENTOS_TAG=$(STACKROX_CENTOS_TAG) \
 		-f images/collector.Dockerfile \
 		images/
 
@@ -48,6 +49,7 @@ collector-image:
 scanner-build-image:
 	$(DOCKER) build \
 		-t quay.io/$(QUAY_REPO)/apollo-ci:$(shell scripts/get_tag.sh "scanner-build") \
+		--build-arg STACKROX_CENTOS_TAG=$(STACKROX_CENTOS_TAG) \
 		-f images/scanner-build.Dockerfile \
 		images/
 
diff --git a/STACKROX_CENTOS_TAG b/STACKROX_CENTOS_TAG
index a1f22cdc..e0e5c77a 100644
--- a/STACKROX_CENTOS_TAG
+++ b/STACKROX_CENTOS_TAG
@@ -1 +1 @@
-stream8
+stream9
diff --git a/images/collector.Dockerfile b/images/collector.Dockerfile
index 102cd014..9d709929 100644
--- a/images/collector.Dockerfile
+++ b/images/collector.Dockerfile
@@ -1,4 +1,5 @@
-FROM quay.io/centos/centos:stream8
+ARG STACKROX_CENTOS_TAG
+FROM quay.io/centos/centos:${STACKROX_CENTOS_TAG}
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
diff --git a/images/scanner-build.Dockerfile b/images/scanner-build.Dockerfile
index 493db4e5..8c5412be 100644
--- a/images/scanner-build.Dockerfile
+++ b/images/scanner-build.Dockerfile
@@ -1,6 +1,7 @@
 # Provides the tooling required to run Scanner dockerized build targets.
 
-FROM quay.io/centos/centos:stream8
+ARG STACKROX_CENTOS_TAG
+FROM quay.io/centos/centos:${STACKROX_CENTOS_TAG}
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
diff --git a/images/stackrox-build.Dockerfile b/images/stackrox-build.Dockerfile
index b4bf630a..5fc741b1 100644
--- a/images/stackrox-build.Dockerfile
+++ b/images/stackrox-build.Dockerfile
@@ -1,7 +1,7 @@
 # Provides the tooling required to run StackRox dockerized build targets.
 
 ARG STACKROX_CENTOS_TAG
-FROM quay.io/centos/centos:${STACKROX_CENTOS_TAG} as base
+FROM quay.io/centos/centos:${STACKROX_CENTOS_TAG}
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
@@ -13,7 +13,7 @@ RUN dnf update -y && \
         epel-release \
         wget \
         && \
-    dnf config-manager --set-enabled powertools && \
+    dnf config-manager --set-enabled crb && \
     dnf update -y && \
     wget --quiet -O - https://rpm.nodesource.com/setup_lts.x | bash - && \
     wget --quiet -O - https://dl.yarnpkg.com/rpm/yarn.repo | tee /etc/yum.repos.d/yarn.repo && \