diff --git a/lazyDir/centos7.Dockerfile b/lazyDir/centos7.Dockerfile
index 2e37e78..66da721 100644
--- a/lazyDir/centos7.Dockerfile
+++ b/lazyDir/centos7.Dockerfile
@@ -87,14 +87,13 @@
     yum -q -y clean all --enablerepo='*'
 
 # Enable SCLs for any later bash session
-# The script can also be sourced if the entry-point is overwritten
-COPY enable-scl.sh /usr/local/bin/scl_enable
-COPY container-entrypoint.sh /usr/local/bin/container-entrypoint
-RUN chmod 0755 /usr/local/bin/container-entrypoint
-ENTRYPOINT [ "/usr/local/bin/container-entrypoint" ]
+COPY scl_enable.sh /usr/local/bin/scl_enable
 ENV BASH_ENV="/usr/local/bin/scl_enable" \
     ENV="/usr/local/bin/scl_enable" \
     PROMPT_COMMAND=". /usr/local/bin/scl_enable"
+COPY container-entrypoint.sh /usr/local/bin/container-entrypoint
+RUN chmod 0755 /usr/local/bin/container-entrypoint
+ENTRYPOINT [ "/usr/local/bin/container-entrypoint" ]
 
 # Configure desired timezone
 ENV TZ=Europe/Amsterdam
diff --git a/lazyDir/container-entrypoint.sh b/lazyDir/container-entrypoint.sh
index 2260a67..72b3bd3 100644
--- a/lazyDir/container-entrypoint.sh
+++ b/lazyDir/container-entrypoint.sh
@@ -1,12 +1,3 @@
 #!/usr/bin/env bash
-
-source /usr/local/bin/enable-scl
-
-# Configure bash behavior
-set -o errexit  # exit on failed command
-set -o nounset  # exit on undeclared variables
-set -o pipefail # exit on any failed command in pipes
-#set -o xtrace  # to debug
-
-# Expand arguments as command
+# Only to enable SCLs by using bash login
 exec "$@"
diff --git a/lazyDir/enable-scl.sh b/lazyDir/enable-scl.sh
deleted file mode 100755
index d931926..0000000
--- a/lazyDir/enable-scl.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-# Make sure home bin directory is in PATH 
-if ! [[ "${PATH}" =~ "${HOME}/bin" ]]; then
-  export PATH="${HOME}/bin:${PATH}"
-fi
-
-# Activate all Software collections - if any
-IFS=$'\n' SCLS=($(scl --list)) && test ${#SCLS[@]} -eq 0 || source scl_source enable "${SCLS[@]}"
diff --git a/lazyDir/scl_enable.sh b/lazyDir/scl_enable.sh
new file mode 100755
index 0000000..e6eb641
--- /dev/null
+++ b/lazyDir/scl_enable.sh
@@ -0,0 +1,9 @@
+# Make sure home bin directory is in PATH 
+if ! [[ "${PATH}" =~ "${HOME}/bin" ]]; then
+  export PATH="${HOME}/bin:${PATH}"
+fi
+
+# Activate all Software collections - if any
+IFS=$'\n' SCLS=($(scl --list)) && test ${#SCLS[@]} -eq 0 || source scl_source enable "${SCLS[@]}"
+
+unset BASH_ENV PROMPT_COMMAND ENV