diff --git a/.github/workflows/build-and-push-image.yml b/.github/workflows/build-and-push-image.yml
index c6dd628..bc4dacc 100644
--- a/.github/workflows/build-and-push-image.yml
+++ b/.github/workflows/build-and-push-image.yml
@@ -15,8 +15,17 @@ jobs:
   build-and-push-image:
     runs-on: ubuntu-latest
 
+    strategy:
+      matrix:
+        os: [fedora, centos]
+        include:
+          - os: fedora
+            tag: eln
+          - os: centos
+            tag: stream9
+
     env:
-      dir: fedora-bootc-cloud
+      dir: cloud
 
     steps:
       - name: Install qemu dependency
@@ -35,10 +44,13 @@ jobs:
         id: build
         uses: redhat-actions/buildah-build@b4dc19b4ba891854660ab1f88a097d45aa158f76 # v2.12
         with:
-          image: quay.io/centos-bootc/${{ env.dir }}
-          tags: eln
+          image: quay.io/centos-bootc/${{ matrix.os }}-bootc-cloud
+          tags: ${{ matrix.tag }}
           oci: true
           containerfiles: ./${{ env.dir }}/Containerfile
+          extra-args: |
+            --from
+            quay.io/centos-bootc/${{ matrix.os }}-bootc-dev:${{ matrix.tag }}
           archs: amd64
           context: ${{ env.dir }}
 
diff --git a/README.md b/README.md
index 472de7e..9ac901f 100644
--- a/README.md
+++ b/README.md
@@ -4,10 +4,7 @@ Images layered on top of the core [centos-bootc][5] base images.
 
 ## Available images
 
-### `quay.io/centos-boot/fedora-bootc-cloud:eln`
-
-This [simple image](fedora-bootc-cloud/) builds on top of the base Fedora ELN image
-and adds cloud-init.
+The [cloud image](cloud) adds cloud-init.
 
 ## Badges
 
diff --git a/fedora-bootc-cloud/Containerfile b/cloud/Containerfile
similarity index 100%
rename from fedora-bootc-cloud/Containerfile
rename to cloud/Containerfile
diff --git a/fedora-bootc-cloud/README.md b/cloud/README.md
similarity index 54%
rename from fedora-bootc-cloud/README.md
rename to cloud/README.md
index 497dc44..913a793 100644
--- a/fedora-bootc-cloud/README.md
+++ b/cloud/README.md
@@ -1,13 +1,17 @@
-# fedora-bootc-cloud:eln
+# A cloud-init image
+
+Pull specs:
+
+- Fedora ELN: `quay.io/centos-bootc/fedora-bootc-cloud:eln`
+- CentOS Stream 9: `quay.io/centos-bootc/centos-bootc-cloud:stream9`
 
 This container image [Containerfile](Containerfile) builds on top of the
-[base Fedora ELN image](github.com/centos/centos-bootc) and adds cloud-init.  It
+[base image](github.com/centos/centos-bootc) and adds cloud-init.  It
 can be used in any virtualization/IaaS system that is
 [supported by cloud-init](https://cloudinit.readthedocs.io/en/latest/reference/datasources.html)
 such as [libvirt](https://blog.wikichoon.com/2020/09/virt-install-cloud-init.html),
 AWS, etc.
 
-- Pull spec: `quay.io/centos-bootc/fedora-bootc-cloud:eln`
-- Download QCOW2: [Download](https://storage.googleapis.com/centos-bootc-dev/fedora-bootc-cloud.qcow2).
+- Download QCOW2: [Fedora ELN](https://storage.googleapis.com/centos-bootc-dev/fedora-bootc-cloud.qcow2).
 
 The qcow2 image was built using [osbuildbootc](https://github.com/cgwalters/osbuildbootc).
diff --git a/fedora-bootc-cloud/usr/lib/bootc/install/05-cloud-kargs.toml b/cloud/usr/lib/bootc/install/05-cloud-kargs.toml
similarity index 100%
rename from fedora-bootc-cloud/usr/lib/bootc/install/05-cloud-kargs.toml
rename to cloud/usr/lib/bootc/install/05-cloud-kargs.toml
diff --git a/fedora-bootc-cloud/usr/lib/systemd/system/serial-getty@ttyS0.service.d/10-autologin.conf b/cloud/usr/lib/systemd/system/serial-getty@ttyS0.service.d/10-autologin.conf
similarity index 100%
rename from fedora-bootc-cloud/usr/lib/systemd/system/serial-getty@ttyS0.service.d/10-autologin.conf
rename to cloud/usr/lib/systemd/system/serial-getty@ttyS0.service.d/10-autologin.conf