diff --git a/docker-bake.hcl b/docker-bake.hcl
index 4513f3a..61e4a66 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -220,7 +220,9 @@ target "nfsd-latest" {
 
 group "all-osbuild-ci" {
         targets = [
-                "osbuild-ci-latest",
+                "osbuild-ci-fedora-latest",
+                "osbuild-ci-c8s-latest",
+                "osbuild-ci-c9s-latest",
         ]
 }
 
@@ -299,15 +301,39 @@ target "virtual-osbuild-ci" {
         ]
 }
 
-target "osbuild-ci-latest" {
+target "osbuild-ci-fedora-latest" {
         args = {
-                OSB_FROM = "docker.io/library/fedora:latest",
+                OSB_FROM = "registry.fedoraproject.org/fedora:latest",
+        }
+        inherits = [
+                "virtual-osbuild-ci",
+        ]
+        tags = concat(
+                mirror("osbuild-ci-fedora", "latest", "", OSB_UNIQUEID),
+        )
+}
+
+target "osbuild-ci-c8s-latest" {
+        args = {
+                OSB_FROM = "quay.io/centos/centos:stream8",
+        }
+        inherits = [
+                "virtual-osbuild-ci",
+        ]
+        tags = concat(
+                mirror("osbuild-ci-c8s", "latest", "", OSB_UNIQUEID),
+        )
+}
+
+target "osbuild-ci-c9s-latest" {
+        args = {
+                OSB_FROM = "quay.io/centos/centos:stream8",
         }
         inherits = [
                 "virtual-osbuild-ci",
         ]
         tags = concat(
-                mirror("osbuild-ci", "latest", "", OSB_UNIQUEID),
+                mirror("osbuild-ci-c9s", "latest", "", OSB_UNIQUEID),
         )
 }