diff --git a/.github/workflows/rhcs.yml b/.github/workflows/rhcs.yml
index 182778f40..fd49032ca 100644
--- a/.github/workflows/rhcs.yml
+++ b/.github/workflows/rhcs.yml
@@ -11,4 +11,10 @@ jobs:
         run: VERSION=5 CEPH_RELEASE=pacific ./contrib/compose-rhcs.sh
 
       - name: compose the RHCS 6 container image
-        run: VERSION=6 CEPH_RELEASE=quincy ./contrib/compose-rhcs.sh
\ No newline at end of file
+        run: VERSION=6 CEPH_RELEASE=quincy ./contrib/compose-rhcs.sh
+
+      - name: compose the RHCS 7 container image
+        run: VERSION=7 CEPH_RELEASE=reef ./contrib/compose-rhcs.sh
+
+      - name: compose the RHCS 8 container image
+        run: VERSION=8 CEPH_RELEASE=squid ./contrib/compose-rhcs.sh
diff --git a/Makefile b/Makefile
index 624ab371e..9b3a1113e 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,7 @@ FLAVORS ?= \
 	pacific,centos,8 \
 	quincy,centos,8 \
 	reef,centos,8 \
+	squid,centos,8 \
 	main,centos,8
 
 TAG_REGISTRY ?= ceph
@@ -52,6 +53,7 @@ ALL_BUILDABLE_FLAVORS := \
 	pacific,centos,8 \
 	quincy,centos,8 \
 	reef,centos,8 \
+	squid,centos,8 \
 	main,centos,8
 
 # ==============================================================================
diff --git a/ceph-releases/ALL/centos/daemon-base/__DOCKERFILE_INSTALL__ b/ceph-releases/ALL/centos/daemon-base/__DOCKERFILE_INSTALL__
index 168193108..1857010ee 100644
--- a/ceph-releases/ALL/centos/daemon-base/__DOCKERFILE_INSTALL__
+++ b/ceph-releases/ALL/centos/daemon-base/__DOCKERFILE_INSTALL__
@@ -5,6 +5,12 @@ bash -c ' \
     if [[ "${CEPH_VERSION}" == master || "${CEPH_VERSION}" == main ]]; then \
       ARCH=$(arch); if [[ "${ARCH}" == "aarch64" ]]; then ARCH="arm64"; fi ; \
       curl -s -L "https://shaman.ceph.com/api/repos/nfs-ganesha/V5.7/latest/centos/__ENV_[DISTRO_VERSION]__/flavors/ceph_main/repo?arch=${ARCH}" -o /etc/yum.repos.d/ganesha.repo ; \
+    elif  [[ "${CEPH_VERSION}" == squid ]]; then \
+      echo "[ganesha]" > /etc/yum.repos.d/ganesha.repo ; \
+      echo "name=ganesha" >> /etc/yum.repos.d/ganesha.repo ; \
+      echo "baseurl=https://buildlogs.centos.org/centos/\$releasever-stream/storage/\$basearch/nfsganesha-5/" >> /etc/yum.repos.d/ganesha.repo ; \
+      echo "gpgcheck=0" >> /etc/yum.repos.d/ganesha.repo ; \
+      echo "enabled=1" >> /etc/yum.repos.d/ganesha.repo  ; \
     elif  [[ "${CEPH_VERSION}" == reef ]]; then \
       echo "[ganesha]" > /etc/yum.repos.d/ganesha.repo ; \
       echo "name=ganesha" >> /etc/yum.repos.d/ganesha.repo ; \
@@ -57,7 +63,7 @@ bash -c ' \
     curl -s -L https://shaman.ceph.com/api/repos/tcmu-runner/main/latest/centos/__ENV_[DISTRO_VERSION]__/repo?arch=$(arch) -o /etc/yum.repos.d/tcmu-runner.repo ; \
     if [[ "${CEPH_VERSION}" =~ master || "${CEPH_VERSION}" == main ]]; then \
       curl -s -L https://shaman.ceph.com/api/repos/ceph-iscsi/main/latest/centos/__ENV_[DISTRO_VERSION]__/repo -o /etc/yum.repos.d/ceph-iscsi.repo ; \
-    elif [[ "${CEPH_VERSION}" =~ nautilus|octopus|pacific|quincy|reef ]]; then \
+    elif [[ "${CEPH_VERSION}" =~ nautilus|octopus|pacific|quincy|reef|squid ]]; then \
       curl -s -L https://download.ceph.com/ceph-iscsi/3/rpm/el__ENV_[DISTRO_VERSION]__/ceph-iscsi.repo -o /etc/yum.repos.d/ceph-iscsi.repo ; \
     else \
       curl -s -L https://download.ceph.com/ceph-iscsi/2/rpm/el__ENV_[DISTRO_VERSION]__/ceph-iscsi.repo -o /etc/yum.repos.d/ceph-iscsi.repo ; \
diff --git a/contrib/build-push-ceph-container-imgs.sh b/contrib/build-push-ceph-container-imgs.sh
index d6f1a3224..fd8f08c72 100644
--- a/contrib/build-push-ceph-container-imgs.sh
+++ b/contrib/build-push-ceph-container-imgs.sh
@@ -51,7 +51,7 @@ OSD_FLAVOR=${OSD_FLAVOR:=default}
 
 if [ -z "$CEPH_RELEASES" ]; then
   # NEVER change 'main' position in the array, this will break the 'latest' tag
-  CEPH_RELEASES=(main pacific quincy reef)
+  CEPH_RELEASES=(main pacific quincy reef squid)
 fi
 
 HOST_ARCH=$(uname -m)
diff --git a/contrib/ceph-build-config.sh b/contrib/ceph-build-config.sh
index 580ad5fd7..d1ddf6492 100644
--- a/contrib/ceph-build-config.sh
+++ b/contrib/ceph-build-config.sh
@@ -13,8 +13,8 @@ trap 'exit $?' ERR
 # These build scripts don't need to have the aarch64 part of the distro specified
 # I.e., specifying 'luminous,centos-arm64,7' is not necessary for aarch64 builds; these scripts
 #       will do the right build. See configurable CENTOS_AARCH64_FLAVOR_DISTRO below
-X86_64_FLAVORS_TO_BUILD="pacific,centos,8 quincy,centos,8 reef,centos,8"
-AARCH64_FLAVORS_TO_BUILD="pacific,centos,8 quincy,centos,8 reef,centos,8"
+X86_64_FLAVORS_TO_BUILD="pacific,centos,8 quincy,centos,8 reef,centos,8 squid,centos,8"
+AARCH64_FLAVORS_TO_BUILD="pacific,centos,8 quincy,centos,8 reef,centos,8 squid,centos,8"
 
 # Allow running this script with the env var ARCH='aarch64' to build arm images
 # ARCH='x86_64'
diff --git a/contrib/common.sh b/contrib/common.sh
index 3f3126453..7d3476de9 100644
--- a/contrib/common.sh
+++ b/contrib/common.sh
@@ -20,8 +20,12 @@ case "${VERSION}" in
     UBI_VERSION=9
     CEPH_RELEASE=reef
     ;;
+  *8*)
+    UBI_VERSION=9
+    CEPH_RELEASE=squid
+    ;;
     *)
-    echo "ERROR: VERSION must be set to 5, 6 or 7."
+    echo "ERROR: VERSION must be set to 6, 7 or 8."
     exit 1
 esac
 
diff --git a/maint-lib/ceph_version.sh b/maint-lib/ceph_version.sh
index f8dfb9292..99ae6850d 100755
--- a/maint-lib/ceph_version.sh
+++ b/maint-lib/ceph_version.sh
@@ -54,6 +54,9 @@ function get_ceph_version {
     *reef*)
       echo reef
       ;;
+    *squid*)
+      echo squid
+      ;;
     *)
       echo main
       ;;