diff --git a/base/km3sim:4.10.05 b/base/km3sim:4.10.05
index 76931fe3f24e42847dd1cc4802bfe1e36e7d720a..254e161311f025e899a898c638d738512ec2b131 100644
--- a/base/km3sim:4.10.05
+++ b/base/km3sim:4.10.05
@@ -2,19 +2,17 @@
 FROM docker.km3net.de/base/centos-full:7
  MAINTAINER Vladimir Kulikovskiy <vkulikovskiy@km3net.de>
 
-# create folder for additional non-standard CentOS7 software
- RUN mkdir $HOME/KM3Sim
-
 # Install newer cmake
  RUN yum remove cmake -y
 
- RUN cd $HOME/KM3Sim && wget https://cmake.org/files/v3.6/cmake-3.6.2.tar.gz && \
+ RUN wget https://cmake.org/files/v3.6/cmake-3.6.2.tar.gz && \
     tar xzf cmake-3.6.2.tar.gz && rm cmake-3.6.2.tar.gz && cd cmake-3.6.2 && \
     ./bootstrap --prefix=/usr/local > bootstrap.log && make > make.log && make install > make_install.log
     
 # Make Geant4
  RUN yum install -y xerces-c xerces-c-devel libX11-devel libXmu-devel motif motif-devel
- RUN cd $HOME/KM3Sim && wget http://cern.ch/geant4-data/releases/geant4.10.05.tar.gz && tar xf geant4.10.05.tar.gz && rm geant4.10.05.tar.gz && \
-    mkdir geant4.10.05_build && cd geant4.10.05_build && \
-    cmake -DCMAKE_INSTALL_PREFIX=$HOME/KM3Sim/geant4.10.05_build -DGEANT4_USE_GDML=ON -DGEANT4_INSTALL_DATA=ON -DGEANT4_XERCESC_INCLUDE_DIR=/usr/include/xercesc/ -DGEANT4_XERCESC_LIBRARY=/usr/lib64/ $HOME/KM3Sim/geant4.10.05 && \
-    make -j4 > make.log && make install > make_install.log
+ RUN wget http://cern.ch/geant4-data/releases/geant4.10.05.tar.gz && tar xf geant4.10.05.tar.gz && rm geant4.10.05.tar.gz && \
+    mkdir geant4.10.05_build && make /usr/local/geant4.10.05_install && cd geant4.10.05_build && \
+    cmake -DCMAKE_INSTALL_PREFIX=/usr/local/geant4.10.05_install -DGEANT4_USE_GDML=ON -DGEANT4_INSTALL_DATA=ON -DGEANT4_XERCESC_INCLUDE_DIR=/usr/include/xercesc/ -DGEANT4_XERCESC_LIBRARY=/usr/lib64/ /KM3Sim/geant4.10.05 && \
+    make -j4 > make.log && make install > make_install.log && cd .. && rm geant4.10.05_build
+ RUN echo "export G4DIR=/usr/local/geant4.10.05_install" >> /etc/bashrc
\ No newline at end of file