diff --git a/containers/rucio-noise/Dockerfile b/containers/rucio-noise/Dockerfile
index 97c8598..935b034 100644
--- a/containers/rucio-noise/Dockerfile
+++ b/containers/rucio-noise/Dockerfile
@@ -1,4 +1,5 @@
-ARG BASEIMAGE=rucio/rucio-server
+ARG BASEIMAGE=rucio/rucio-clients
+#ARG BASEIMAGE=rucio/rucio-server
 ARG BASETAG=release-32.0.0
  
 FROM $BASEIMAGE:$BASETAG
@@ -43,6 +44,14 @@ RUN mkdir -p /etc/grid-security/vomsdir/escape \
 RUN curl -o /usr/bin/kubectl -L https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl
 RUN chmod +x /usr/bin/kubectl
 
+# From here 
+RUN yum install -y gcc pip python-devel \
+    && pip install --upgrade pip
+RUN pip install reana-client
+
+ADD --chown=user:user rucio.cfg.escape.j2 /opt/user/rucio.cfg.j2
+# To here testing the reana-client base image
+
 WORKDIR /home
 
 COPY ./produce_noise.sh requirements.txt rses.txt /home/
diff --git a/containers/rucio-noise/rucio.cfg.escape.j2 b/containers/rucio-noise/rucio.cfg.escape.j2
new file mode 100644
index 0000000..720a59c
--- /dev/null
+++ b/containers/rucio-noise/rucio.cfg.escape.j2
@@ -0,0 +1,28 @@
+[client]
+rucio_host = {{ RUCIO_CFG_RUCIO_HOST | default('https://vre-dev-rucio.cern.ch') }} 
+auth_host = {{ RUCIO_CFG_AUTH_HOST | default('https://vre-dev-auth-rucio.cern.ch') }} 
+ca_cert = {{ RUCIO_CFG_CA_CERT | default('/etc/pki/tls/certs/CERN-bundle.pem') }}
+auth_type = {{ RUCIO_CFG_AUTH_TYPE | default('oidc') }}
+username = {{ RUCIO_CFG_USERNAME | default('') }}
+password = {{ RUCIO_CFG_PASSWORD | default('') }}
+account = {{ RUCIO_CFG_ACCOUNT | default('') }}
+client_cert = {{ RUCIO_CFG_CLIENT_CERT | default('/opt/rucio/etc/client.crt') }}
+client_key = {{ RUCIO_CFG_CLIENT_KEY | default('/opt/rucio/etc/client.key') }}
+client_x509_proxy = {{ RUCIO_CFG_CLIENT_X509_PROXY | default('/tmp/x509up') }}
+request_retries = {{ RUCIO_CFG_REQUEST_RETRIES | default('3') }}
+oidc_issuer = {{ RUCIO_CFG_OIDC_ISSUER | default('escape') }}  
+oidc_polling = {{ RUCIO_CFG_OIDC_POLLING | default('true') }}  
+oidc_audience = {{ RUCIO_CFG_OIDC_AUDIENCE | default('rucio') }} 
+oidc_scope = {{ RUCIO_CFG_OIDC_SCOPE | default('openid profile offline_access wlcg wlcg.groups fts:submit-transfer') }} 
+auth_oidc_refresh_activate = {{ RUCIO_CFG_AUTH_OIDC_REFRESH_ACTIVATE | default('true') }} 
+
+[policy]
+permission = {{ RUCIO_CFG_POLICY_PERMISSION | default('escape')}}
+schema = {{ RUCIO_CFG_POLICY_SCHEMA | default('escape') }}
+lfn2pfn_algorithm_default = {{ RUCIO_CFG_POLICY_LFN2PFN_ALGORITHM_DEFAULT | default('hash') }}
+support = {{ RUCIO_CFG_POLICY_SUPPORT | default('https://github.com/rucio/rucio/issues/') }}
+support_rucio = {{ RUCIO_CFG_POLICY_SUPPORT_RUCIO | default('https://github.com/rucio/rucio/issues/') }}
+
+[credentials]
+gcs = {{ RUCIO_CFG_CREDENTIALS_GCS | default('/opt/rucio/etc/rse-accounts.cfg')}}
+signature_lifetime = {{ RUCIO_CFG_SIGNATURE_LIFETIME | default('3600') }}
\ No newline at end of file
diff --git a/containers/rucio-noise/rucio.default-escape.cfg b/containers/rucio-noise/rucio.default-escape.cfg
new file mode 100644
index 0000000..e386f92
--- /dev/null
+++ b/containers/rucio-noise/rucio.default-escape.cfg
@@ -0,0 +1,26 @@
+# Please note that this config is just for the DEV VRE cluster
+
+[client]
+rucio_host = localhost
+auth_host = localhost
+ca_cert = /etc/pki/tls/certs/ca-bundle.crt
+auth_type =
+username =
+password =
+account =
+# client_cert =
+# client_key =
+# client_x509_proxy =
+request_retries = 3
+
+[policy]
+permission = generic
+schema = generic
+lfn2pfn_algorithm_default = hash
+support = https://github.com/rucio/rucio/issues/
+support_rucio = https://github.com/rucio/rucio/issues/
+
+[credentials]
+gcs = /opt/rucio/etc/rse-accounts.cfg
+signature_lifetime = 3600
+