diff --git a/build-rucio-images.sh b/build-rucio-images.sh
index 9901ef5a..49e0e99b 100755
--- a/build-rucio-images.sh
+++ b/build-rucio-images.sh
@@ -3,7 +3,7 @@
 set -e
 
 export RUCIO_VERSION=1.31.6
-export CMS_VERSION=${RUCIO_VERSION}.cms2
+export CMS_VERSION=${RUCIO_VERSION}.cms3
 
 export HARBOR=registry.cern.ch/cmsrucio
 
diff --git a/docker/rucio-server/Dockerfile b/docker/rucio-server/Dockerfile
index 91a3e750..f3da23b2 100644
--- a/docker/rucio-server/Dockerfile
+++ b/docker/rucio-server/Dockerfile
@@ -11,19 +11,14 @@ ARG RUCIO_VERSION
 
 FROM rucio/rucio-server:release-$RUCIO_VERSION
 
-# Add CMS policy package
-RUN mkdir -p /opt/rucio/policy/CMSRucioPolicy
-COPY src/policy/CMSRucioPolicy/ /opt/rucio/policy/CMSRucioPolicy/
-
-# FIXME: Probably don't need these anymore either
-RUN yum -y install http://linuxsoft.cern.ch/wlcg/centos7/x86_64/wlcg-repo-1.0.0-1.el7.noarch.rpm && \
-    yum clean all && \
-    rm -rf /var/cache/yum
-ADD http://repository.egi.eu/sw/production/cas/1/current/repo-files/EGI-trustanchors.repo /etc/yum.repos.d/egi.repo
 RUN yum update  -y && \
     yum clean all && \
     rm -rf /var/cache/yum
 
+# Add CMS policy package
+RUN mkdir -p /opt/rucio/policy/CMSRucioPolicy
+COPY src/policy/CMSRucioPolicy/ /opt/rucio/policy/CMSRucioPolicy/
+
 RUN mkdir -p /etc/grid-security && ln -s /cvmfs/grid.cern.ch/etc/grid-security/certificates /etc/grid-security/
 ENV RUCIO_CA_PATH="/cvmfs/grid.cern.ch/etc/grid-security/certificates"
 ADD docker/rucio-server/cms-entrypoint.sh /
diff --git a/docker/rucio-ui/Dockerfile b/docker/rucio-ui/Dockerfile
index f2e04ac1..e281447d 100644
--- a/docker/rucio-ui/Dockerfile
+++ b/docker/rucio-ui/Dockerfile
@@ -10,20 +10,14 @@
 ARG RUCIO_VERSION
 FROM rucio/rucio-ui:release-$RUCIO_VERSION
 
-# Add CMS policy package
-RUN mkdir -p /opt/rucio/policy/CMSRucioPolicy
-COPY src/policy/CMSRucioPolicy /opt/rucio/policy/CMSRucioPolicy
-
-# FIXME: Probably don't need this anymore
-RUN yum -y install http://linuxsoft.cern.ch/wlcg/centos7/x86_64/wlcg-repo-1.0.0-1.el7.noarch.rpm \
-    && yum clean all \
-    && rm -rf /var/cache/yum
-
-ADD http://repository.egi.eu/sw/production/cas/1/current/repo-files/EGI-trustanchors.repo /etc/yum.repos.d/egi.repo
 RUN yum update  -y \
     && yum clean all \
     && rm -rf /var/cache/yum
 
+# Add CMS policy package
+RUN mkdir -p /opt/rucio/policy/CMSRucioPolicy
+COPY src/policy/CMSRucioPolicy /opt/rucio/policy/CMSRucioPolicy
+
 RUN mkdir -p /etc/grid-security && ln -s /cvmfs/grid.cern.ch/etc/grid-security/certificates /etc/grid-security/
 
 # Might get recreated if apache was upgraded