diff --git a/containers/rucio-client/rucio.cfg.escape.j2 b/containers/rucio-client/rucio.cfg.escape.j2
index a24331b..720a59c 100644
--- a/containers/rucio-client/rucio.cfg.escape.j2
+++ b/containers/rucio-client/rucio.cfg.escape.j2
@@ -22,3 +22,7 @@ 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/Dockerfile b/containers/rucio-noise/Dockerfile
index 7a58128..4e440fe 100644
--- a/containers/rucio-noise/Dockerfile
+++ b/containers/rucio-noise/Dockerfile
@@ -49,7 +49,11 @@ 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
+# ADD --chown=user:user rucio.cfg.escape.j2 /opt/user/rucio.cfg.j2
+
+# Overwritting the path in rucio init script
+ADD init_rucio.sh /etc/profile.d/init_rucio.sh
+
 # To here testing the reana-client base image
 
 WORKDIR /home
diff --git a/containers/rucio-noise/init_rucio.sh b/containers/rucio-noise/init_rucio.sh
new file mode 100644
index 0000000..244edab
--- /dev/null
+++ b/containers/rucio-noise/init_rucio.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+# Authors:
+# - Vincent Garonne, <vgaronne@gmail.com>, 2018
+
+## Customised version to make v32.0.0 run on the VRE - DEV cluster
+
+shopt -s checkwinsize
+
+if [ ! -f /opt/rucio/etc/rucio.cfg ]; then
+    echo "File rucio.cfg not found. It will generate one."
+    mkdir -p /opt/rucio/etc/
+#    python3 /usr/local/rucio_client/merge_rucio_configs.py \
+#        -s /opt/user/rucio.default.cfg \
+    python3 /usr/local/rucio/tools/merge_rucio_configs.py \
+        --use-env \
+        -d /opt/rucio/etc/rucio.cfg
+fi
+
+echo "Enable shell completion on the rucio commands"
+eval "$(register-python-argcomplete rucio)"
+eval "$(register-python-argcomplete rucio-admin)"
\ No newline at end of file
diff --git a/containers/rucio-noise/rses.txt b/containers/rucio-noise/rses.txt
index 1953147..55b7033 100644
--- a/containers/rucio-noise/rses.txt
+++ b/containers/rucio-noise/rses.txt
@@ -1,2 +1,2 @@
 DEV-CERN-EOS
-DEV-CESNET-S3
\ No newline at end of file
+DEV-CESNET-S3
diff --git a/containers/rucio-noise/rucio.cfg.escape.j2 b/containers/rucio-noise/rucio.cfg.escape.j2
index 720a59c..4d9c2b0 100644
--- a/containers/rucio-noise/rucio.cfg.escape.j2
+++ b/containers/rucio-noise/rucio.cfg.escape.j2
@@ -24,5 +24,4 @@ support = {{ RUCIO_CFG_POLICY_SUPPORT | default('https://github.com/rucio/rucio/
 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
+gcs = {{ RUCIO_CFG_CREDENTIALS_GCS | default('/opt/rucio/etc/rse-accounts.cfg')}}
\ No newline at end of file