diff --git a/containers/rucio-client/Dockerfile b/containers/rucio-client/Dockerfile
index 83156b01..42d63d5c 100644
--- a/containers/rucio-client/Dockerfile
+++ b/containers/rucio-client/Dockerfile
@@ -1,46 +1,51 @@
 # VRE rucio-client image is the only which BASE is not the vre-base-ops image
 
+ARG BASEIMAGE=rucio/rucio-clients
 ARG BASETAG=release-1.30.0
 ARG BUILD_DATE
 
-#FROM ghcr.io/vre-hub/vre-base-ops:${TAG}
-FROM rucio/rucio-clients:${BASETAG}
+FROM ${BASEIMAGE}:${BASETAG}
 LABEL maintainer="VRE Team @ CERN 22/23 - E. Garcia, E. Gazzarrini, D. Gosein"
 LABEL org.opencontainers.image.source https://github.com/vre-hub/vre
 LABEL org.label-schema.build-date=${BUILD_DATE}
 
 USER root
 
+# cleanup yum cache
 RUN yum upgrade -y \
     && yum clean all \
     && rm -rf /var/cache/yum
 
+# install useful tools
+RUN yum -y install git htop wget
+RUN pip install --upgrade pip
+
 # EGI trust anchors
 RUN curl -Lo /etc/yum.repos.d/egi-trustanchors.repo https://repository.egi.eu/sw/production/cas/1/current/repo-files/egi-trustanchors.repo \
-    && yum update -y 
+    && yum update -y
 
-RUN yum clean metadata
-RUN yum -y install wget ca-certificates ca-policy-egi-core
 
-# CERN cert 
+RUN yum -y install ca-certificates ca-policy-egi-core
+
+# Install CERN CA certs from CERN maintained mirrors
+# This will add a `CERN-bundle.pem` file (among others) into `/etc/pki/tls/certs/`
 COPY ./linuxsupport7s-stable.repo /etc/yum.repos.d/
 RUN yum install -y CERN-CA-certs
 
 # ESCAPE VOMS setup
 RUN mkdir -p /etc/vomses \
-    && wget https://indigo-iam.github.io/escape-docs/voms-config/voms-escape.cloud.cnaf.infn.it.vomses -O /etc/vomses/voms-escape.cloud.cnaf.infn.it.vomses
-RUN mkdir -p /etc/grid-security/vomsdir/escape \
+    && wget https://indigo-iam.github.io/escape-docs/voms-config/voms-escape.cloud.cnaf.infn.it.vomses -O /etc/vomses/voms-escape.cloud.cnaf.infn.it.vomses \
+    && mkdir -p /etc/grid-security/vomsdir/escape \
     && wget https://indigo-iam.github.io/escape-docs/voms-config/voms-escape.cloud.cnaf.infn.it.lsc -O /etc/grid-security/vomsdir/escape/voms-escape.cloud.cnaf.infn.it.lsc
 
-# ESCAPE Rucio setup
-ADD --chown=user:user rucio.cfg.escape.j2 /opt/user/rucio.cfg.j2
-
 # install reana-client 
 ENV LC_ALL=en_US.UTF-8
-RUN pip install --upgrade pip
 RUN pip install reana-client==0.9.2
 
 USER user
 WORKDIR /home/user
 
-ENTRYPOINT ["/bin/bash"]
\ No newline at end of file
+# ESCAPE Rucio client configuration
+ADD --chown=user:user rucio.cfg.escape.j2 /opt/user/rucio.cfg.j2
+
+ENTRYPOINT ["/bin/bash"]