diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 71fcaae..2144990 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -160,9 +160,9 @@ jobs:
               TST_KERNEL: ../linux
               TST_EVM_CHANGE_MODE: 1
 
-          - container: "centos:7"
+          - container: "quay.io/centos/centos:stream9"
             env:
-              CC: gcc
+              CC: clang
               TSS: tpm2-tss
 
           - container: "debian:testing"
diff --git a/.travis.yml b/.travis.yml
index b8876f4..b690738 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,11 +56,7 @@ matrix:
           compiler: clang
 
         - os: linux
-          env: DISTRO=centos:7 TSS=tpm2-tss CONTAINER=podman CONTAINER_ARGS="--runtime=/usr/bin/crun --network=host"
-          compiler: gcc
-
-        - os: linux
-          env: REPO="quay.io/centos/" DISTRO="${REPO}centos:stream8" TSS=tpm2-tss CONTAINER=podman CONTAINER_ARGS="--runtime=/usr/bin/crun --network=host"
+          env: REPO="quay.io/centos/" DISTRO="${REPO}centos:stream9" TSS=tpm2-tss CONTAINER=podman CONTAINER_ARGS="--runtime=/usr/bin/crun --network=host"
           compiler: clang
 
         - os: linux
diff --git a/ci/fedora.sh b/ci/fedora.sh
index 44fd956..9fc3393 100755
--- a/ci/fedora.sh
+++ b/ci/fedora.sh
@@ -7,6 +7,12 @@ if [ -z "$CC" ]; then
 	exit 1
 fi
 
+# Install crb for tss2-devel and tpm2-tss-devel on CentOS stream 9
+if [ -f /etc/centos-release ]; then
+	yum -y install dnf-plugins-core
+	yum -y config-manager --set-enabled crb
+fi
+
 case "$TSS" in
 ibmtss) TSS="tss2-devel";;
 tpm2-tss) TSS="tpm2-tss-devel";;
diff --git a/ci/quay.io.sh b/ci/quay.io.sh
new file mode 120000
index 0000000..1479a43
--- /dev/null
+++ b/ci/quay.io.sh
@@ -0,0 +1 @@
+fedora.sh
\ No newline at end of file