diff --git a/c8-cms/Dockerfile b/c8-cms/Dockerfile
index 67ca14727c1896a66a0594190f65769ca907777a..c37d2b6901d4b8f8fe8df385fe6369c8b7be3027 100644
--- a/c8-cms/Dockerfile
+++ b/c8-cms/Dockerfile
@@ -4,7 +4,6 @@
 
 # Use Centos 8 or Centos Stream 8?
 ARG BASEIMAGE=gitlab-registry.cern.ch/linuxsupport/c8-base:20210901-1.x86_64
-#ARG BASEIMAGE=gitlab-registry.cern.ch/linuxsupport/cs8-base
 
 # Set up the C8 CMSSW base:
 FROM ${BASEIMAGE}
@@ -57,6 +56,11 @@ RUN     wget http://repository.egi.eu/sw/production/cas/1/current/repo-files/EGI
         yum install -y ca-policy-egi-core wlcg-repo.noarch HEP_OSlibs && \
         yum clean -y all
 
+ADD 	eos.repo /etc/yum.repos.d/eos.repo
+RUN 	yum --enablerepo=extras install -y epel-release && \
+	yum install -y eos-client && \
+    	yum clean -y all
+
 RUN     groupadd -g 1000 cmsusr && adduser -u 1000 -g 1000 -G root cmsusr && \
         echo "cmsusr ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers && \
         groupadd -g 1001 cmsinst && adduser -u 1001 -g 1001 cmsinst && \
diff --git a/c8-cms/Makefile b/c8-cms/Makefile
index f12a3754538438b77fa0869f9e8a59927be03751..718369970f50f7672c0bacd7b92c6760e265cce0 100644
--- a/c8-cms/Makefile
+++ b/c8-cms/Makefile
@@ -7,8 +7,8 @@ build: docker_build output
 release: docker_build docker_push output
 
 # Image can be overidden with env var.
-DOCKER_IMAGE ?= cmscloud/cc8-cms
-CERN_IMAGE ?= gitlab-registry.cern.ch/cms-cloud/cmssw-docker/cc8-cvmfs
+DOCKER_IMAGE ?= cmscloud/c8-cms
+CERN_IMAGE ?= gitlab-registry.cern.ch/cms-cloud/cmssw-docker/c8-cvmfs
 
 # Get the latest commit.
 GIT_COMMIT = $(strip $(shell git rev-parse --short HEAD))
diff --git a/c8-cms/eos.repo b/c8-cms/eos.repo
new file mode 100644
index 0000000000000000000000000000000000000000..3bc5de2f3ad4d78d79f4a0130e8c9f4dade777ff
--- /dev/null
+++ b/c8-cms/eos.repo
@@ -0,0 +1,9 @@
+[eos-citrine]
+name=EOS 4.0 Version
+baseurl=https://storage-ci.web.cern.ch/storage-ci/eos/citrine/tag/el-8/x86_64/
+gpgcheck=0
+
+[eos-citrine-dep]
+name=EOS 4.0 Dependencies
+baseurl=https://storage-ci.web.cern.ch/storage-ci/eos/citrine-depend/el-8/x86_64/
+gpgcheck=0