diff --git a/Dockerfile b/Dockerfile
index 8a907bbeb49b310622d871a02082778bc04c13d4..6391eec6b23aa47c6097dc0768d2801d286e146b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,11 +11,6 @@
 FROM centos:latest
 MAINTAINER "CERN IT-DI-CSO <computer.security@cern.ch>"
 
-#
-# Helpful variables
-#
-ENV basedir /opt
-
 #
 # Install with YUM:
 # - Epel Repo
@@ -57,6 +52,7 @@ RUN yum -y install epel-release && \
 #
 RUN pip install --upgrade pip && pip install cpplint
 
+WORKDIR /opt
 
 #
 # Install FindBugs
@@ -92,14 +88,14 @@ RUN wget https://github.com/pmd/pmd/releases/download/pmd_releases%2F5.5.1/pmd-b
 #
 # Install RATS
 #
-WORKDIR $basedir
 RUN wget http://fossies.org/linux/privat/rats-2.4.tgz && \
     tar -xzf rats-2.4.tgz && \
     rm -f rats-2.4.tgz && \
     cd rats-2.4 && \
     ./configure && \
     make && \
-    make install
+    make install && \
+    cd ..
 
 #
 # Finish