diff --git a/fairroot.sh b/fairroot.sh
index a73f2c8224..86831c379d 100644
--- a/fairroot.sh
+++ b/fairroot.sh
@@ -69,9 +69,12 @@ proc ModulesHelp { } {
 set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
 module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
 # Dependencies
-module load BASE/1.0 ${BOOST_VERSION:+boost/$BOOST_VERSION-$BOOST_REVISION} ROOT/$ROOT_VERSION-$ROOT_REVISION ${ZEROMQ_VERSION:+ZeroMQ/$ZEROMQ_VERSION-$ZEROMQ_REVISION} ${DDS_ROOT:+DDS/$DDS_VERSION-$DDS_REVISION} ${GCC_TOOLCHAIN_ROOT:+GCC-Toolchain/$GCC_TOOLCHAIN_VERSION-$GCC_TOOLCHAIN_REVISION}
+module load BASE/1.0 ${GEANT3_VERSION:+GEANT3/$GEANT3_VERSION-$GEANT3_REVISION} ${GEANT4_VERSION:+GEANT4/$GEANT4_VERSION-$GEANT4_REVISION} ${PROTOBUF_VERSION:+protobuf/$PROTOBUF_VERSION-$PROTOBUF_REVISION} ${PYTHIA6_VERSION:+Pythia6/$PYTHIA6_VERSION-$PYTHIA6_REVISION} ${PYTHIA_VERSION:+Pythia/$PYTHIA_VERSION-$PYTHIA_REVISION} ${GEANT4_VMC_VERSION:+GEANT4_VMC/$GEANT4_VMC_VERSION-$GEANT4_VMC_REVISION} ${VGM_VERSION:+vgm/$VGM_VERSION-$VGM_REVISION} ${BOOST_VERSION:+boost/$BOOST_VERSION-$BOOST_REVISION} ROOT/$ROOT_VERSION-$ROOT_REVISION ${ZEROMQ_VERSION:+ZeroMQ/$ZEROMQ_VERSION-$ZEROMQ_REVISION} ${DDS_ROOT:+DDS/$DDS_VERSION-$DDS_REVISION} ${GCC_TOOLCHAIN_ROOT:+GCC-Toolchain/$GCC_TOOLCHAIN_VERSION-$GCC_TOOLCHAIN_REVISION}
 # Our environment
 setenv FAIRROOT_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
+setenv VMCWORKDIR \$::env(FAIRROOT_ROOT)/share/fairbase/examples
+setenv GEOMPATH \$::env(VMCWORKDIR)/common/geometry
+setenv CONFIG_DIR \$::env(VMCWORKDIR)/common/gconfig
 prepend-path LD_LIBRARY_PATH \$::env(FAIRROOT_ROOT)/lib
 $([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(FAIRROOT_ROOT)/lib")
 EoF
diff --git a/geant3.sh b/geant3.sh
index 25b2ace92e..03aeedebcc 100644
--- a/geant3.sh
+++ b/geant3.sh
@@ -37,6 +37,7 @@ module load BASE/1.0 ROOT/$ROOT_VERSION-$ROOT_REVISION
 # Our environment
 setenv GEANT3_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
 setenv GEANT3DIR \$::env(GEANT3_ROOT)
+setenv G3SYS \$::env(GEANT3_ROOT)
 prepend-path PATH \$::env(GEANT3_ROOT)/bin
 prepend-path LD_LIBRARY_PATH \$::env(GEANT3_ROOT)/lib64
 $([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(GEANT3_ROOT)/lib64")
diff --git a/geant4.sh b/geant4.sh
index 3525ace255..5b37347290 100644
--- a/geant4.sh
+++ b/geant4.sh
@@ -10,12 +10,16 @@ env:
   G4INSTALL: "$GEANT4_ROOT"
   G4INSTALL_DATA: "$GEANT4_ROOT/share/Geant4-10.1.3"
   G4SYSTEM: "$(uname)-g++"
-  G4LEVELGAMMADATA: "$GEANT4_ROOT/share/Geant4-10.1.3/data/PhotonEvaporation3.1"
-  G4RADIOACTIVEDATA: "$GEANT4_ROOT/share/Geant4-10.1.3/data/RadioactiveDecay4.2"
-  G4LEDATA: "$GEANT4_ROOT/share/Geant4-10.1.3/data/G4EMLOW6.41"
-  G4NEUTRONHPDATA: "$GEANT4_ROOT/share/Geant4-10.1.3/data/G4NDL4.5"
-  G4NEUTRONXSDATA: "$GEANT4_ROOT/share/Geant4-10.1.3/data/G4NEUTRONXS1.4"
-  G4SAIDXSDATA: "$GEANT4_ROOT/share/Geant4-10.1.3/data/G4SAIDDATA1.1"
+  G4LEVELGAMMADATA:         "$GEANT4_ROOT/share/Geant4-10.1.3/data/PhotonEvaporation3.1"
+  G4RADIOACTIVEDATA:        "$GEANT4_ROOT/share/Geant4-10.1.3/data/RadioactiveDecay4.2"
+  G4LEDATA:                 "$GEANT4_ROOT/share/Geant4-10.1.3/data/G4EMLOW6.41"
+  G4NEUTRONHPDATA:          "$GEANT4_ROOT/share/Geant4-10.1.3/data/G4NDL4.5"
+  G4NEUTRONXSDATA:          "$GEANT4_ROOT/share/Geant4-10.1.3/data/G4NEUTRONXS1.4"
+  G4SAIDXSDATA:             "$GEANT4_ROOT/share/Geant4-10.1.3/data/G4SAIDDATA1.1"
+  G4NeutronHPCrossSections: "$GEANT4_ROOT/share/Geant4-10.1.3/data/G4NDL"
+  G4PIIDATA:                "$GEANT4_ROOT/share/Geant4-10.1.3/data/G4PII1.3"
+  G4REALSURFACEDATA:        "$GEANT4_ROOT/share/Geant4-10.1.3/data/RealSurface1.0"
+  G4ENSDFSTATEDATA:         "$GEANT4_ROOT/share/Geant4-10.1.3/data/G4ENSDFSTATE1.0"
 ---
 #!/bin/bash -e
 
diff --git a/o2.sh b/o2.sh
index e334240a62..69283878a5 100644
--- a/o2.sh
+++ b/o2.sh
@@ -29,7 +29,7 @@ case $ARCHITECTURE in
 esac
 
 cmake $SOURCEDIR -DCMAKE_INSTALL_PREFIX=$INSTALLROOT                                              \
-      -DCMAKE_MODULE_PATH="$SOURCEDIR/cmake/modules;$FAIRROOT_ROOT/share/fairbase/cmake/modules"  \
+      -DCMAKE_MODULE_PATH="$SOURCEDIR/cmake/modules;$FAIRROOT_ROOT/share/fairbase/cmake/modules;$FAIRROOT_ROOT/share/fairbase/cmake/modules_old"  \
       -DFairRoot_DIR=$FAIRROOT_ROOT                                                               \
       -DALICEO2_MODULAR_BUILD=ON                                                                  \
       -DROOTSYS=$ROOTSYS                                                                          \
@@ -63,6 +63,7 @@ module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@
 module load BASE/1.0 FairRoot/$FAIRROOT_VERSION-$FAIRROOT_REVISION ${DDS_ROOT:+DDS/$DDS_VERSION-$DDS_REVISION} ${GCC_TOOLCHAIN_ROOT:+GCC-Toolchain/$GCC_TOOLCHAIN_VERSION-$GCC_TOOLCHAIN_REVISION}
 # Our environment
 setenv O2_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
+setenv VMCWORKDIR \$::env(O2_ROOT)/share
 prepend-path PATH \$::env(O2_ROOT)/bin
 prepend-path LD_LIBRARY_PATH \$::env(O2_ROOT)/lib
 $([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(O2_ROOT)/lib")