diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 122522704a..fd986a4cd6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -25,12 +25,17 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        os: [centos_stream8]
+        os: [centos_stream8, centos_stream9]
+      include:
+        - os: centos_stream8
+          centos_version: 8
+        - os: centos_stream9
+          centos_version: 9
     steps:
     - name: Checkout
       uses: actions/checkout@master
     - name: Build
-      run: docker build -t docker.io/rhcsdashboard/ceph-base:${{ matrix.os }} -f docker/ceph/centos/Dockerfile ./docker/ceph
+      run: docker build -t docker.io/rhcsdashboard/ceph-base:${{ matrix.os }} -f docker/ceph/centos/Dockerfile --build-arg CENTOS_VERSION=${{ matrix.centos_version }} ./docker/ceph
     - name: Google Chat Notification
       uses: Co-qn/google-chat-notification@b9227d9daa4638c9782a5bd16c4abb86268127a1
       with:
@@ -52,17 +57,20 @@ jobs:
         branch: [main, quincy, pacific, octopus, nautilus]
         name: [ceph, ceph-rpm]
         include:
+          - centos_version: 8
           - name: ceph
             dir: ceph
           - name: ceph-rpm
             dir: ceph/rpm
           - branch: nautilus
             branch_dir: nautilus
+          - branch: main
+            centos_version: 9
     steps:
     - name: Checkout
       uses: actions/checkout@master
     - name: Build
-      run: docker build -t docker.io/rhcsdashboard/${{ matrix.name }}:${{ matrix.branch }} -f docker/${{ matrix.dir }}/${{ matrix.branch_dir}}/Dockerfile ./docker/ceph --build-arg CEPH_RELEASE=${{ matrix.branch }} --build-arg VCS_BRANCH=${{ matrix.branch }}
+      run: docker build -t docker.io/rhcsdashboard/${{ matrix.name }}:${{ matrix.branch }} -f docker/${{ matrix.dir }}/${{ matrix.branch_dir}}/Dockerfile ./docker/ceph --build-arg CEPH_RELEASE=${{ matrix.branch }} --build-arg VCS_BRANCH=${{ matrix.branch }} --build-arg CENTOS_VERSION=${{ matrix.centos_version }}
     - name: Google Chat Notification
       uses: Co-qn/google-chat-notification@b9227d9daa4638c9782a5bd16c4abb86268127a1
       with: