diff --git a/Dockerfile b/Dockerfile
index 167bd2654cadb70839c904212cbf55f257dc18a3..0c18c673d8924fddd6264f5694105f2867573fab 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,7 +25,7 @@ RUN apt-get update -y && apt-get install -y \
 COPY trainbenchmark-reporting/install.R /trainbenchmark/trainbenchmark-reporting/install.R
 RUN Rscript /trainbenchmark/trainbenchmark-reporting/install.R
 
-USER user
+#USER user
 WORKDIR /trainbenchmark
 
 COPY --chown=user:user . .
@@ -41,3 +41,4 @@ RUN ./gradlew --no-daemon initScripts
 # RUN ./gradlew --no-daemon generate
 # RUN ./gradlew --no-daemon individualInjectBenchmark
 # RUN ./gradlew --no-daemon individualRepairBenchmark
+ENTRYPOINT /bin/bash
diff --git a/docker/bashrc b/docker/bashrc
index 319909a671cf2db6aa95aa8ce9ca0595da902055..f0e4bb29104396ad8ba0e239fc24c07f7f9ee28e 100644
--- a/docker/bashrc
+++ b/docker/bashrc
@@ -1,5 +1,3 @@
-source /etc/bashrc
-
 function csv_viewer {
  column -t -s, -n "$@" | less -F -S -X -K
 }
@@ -7,7 +5,7 @@ alias doc_motd="bash /trainbenchmark/docs/motd"
 alias doc_basic="bash /trainbenchmark/docs/basic"
 alias doc_advanced="bash /trainbenchmark/docs/advanced"
 
-alias cowsay="cowsay -f /trainbenchmark/docker/frog.cow"
-alias cowsay_tip="shuf -n 1 /trainbenchmark/docker/tips | cowsay -f /trainbenchmark/docker/frog.cow"
+alias frogsay="/usr/games/cowsay -f /trainbenchmark/docker/frog.cow"
+alias frogsay_tip="shuf -n 1 /trainbenchmark/docker/tips | frogsay"
 
 doc_motd
diff --git a/docs/motd b/docs/motd
index 061cf56d5a7aa37e223c01e7fb87858122320b2a..8cd2dfe9e66dfb60509b035dc444c92ae13df650 100644
--- a/docs/motd
+++ b/docs/motd
@@ -1,5 +1,4 @@
 #!/bin/bash
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 # echo -e "                                                                                    "
 # echo -e "  *   )                          )                      )                        )  "
 # echo -e "  )  /( (       )  (          ( /(    (              ( /(     )       )  (    ( /(  "
@@ -9,8 +8,9 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 # echo -e "  | |  | '_|/ _' | | || ' \))| '_ \/ -_)| ' \))/ _| | ' \ | '  \()/ _' || '_|| / /  "
 # echo -e "  |_|  |_|  \__,_| |_||_||_| |_.__/\___||_||_| \__| |_||_||_|_|_| \__,_||_|  |_\_\  "
 # echo -e "                                                                                    "
-cowsay_tip
-bash $DIR/basic
+echo "Welcome to the Trainbenchmark! I'll be your guide.. just type frogsay_tip" | /usr/games/cowsay -f /trainbenchmark/docker/frog.cow
+#DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+#bash $DIR/basic
 echo -e ""
 echo -e "\033[1;96mDocumentation"
 echo -e "\033[0mRun the following commands"