diff --git a/autoconf_share/weeklybuild.sh b/autoconf_share/weeklybuild.sh
index f5da966ad25473bf560cf76aa17df99c00164549..436be9e148f2449fe8a974145113c28c64b38808 100755
--- a/autoconf_share/weeklybuild.sh
+++ b/autoconf_share/weeklybuild.sh
@@ -26,48 +26,47 @@ cd LOFAR
 #
 #source $INSTALLDIR/gnu_debug/lofarinit.sh
 rm -rf $INSTALLDIR/gnu_debug/*
-autoconf_share/rub -system -noupdate -release=main -confopt "--prefix=$INSTALLDIR/gnu_debug" -build "gnu_debug" Appl LCS CEP MAC/{Test/Suite,GCF/GCFCommon,GCF/TM,APL/RTCCommon,APL/PAC/BeamServer,APL/PAC/BS_Protocol,APL/PAC/CAL_Protocol,APL/PAC/CalServer,APL/PIC/RSPDriver,APL/PIC/RSP_Protocol} Demo > $BUILDROOT/lofar17-week`date +%g%W`-gnu_debug.log 2>&1
+autoconf_share/rub -k -noupdate -release=main -confopt "--prefix=$INSTALLDIR/gnu_debug" -build "gnu_debug" Appl LCS CEP MAC Demo > $BUILDROOT/lofar17-week`date +%g%W`-gnu_debug.log 2>&1
 
 
 # GNU_DEBUG_VALGRIND Build
 #
-rm -rf $INSTALLDIR/gnu_valgrind
-mkdir -p $INSTALLDIR/gnu_valgrind
-autoconf_share/rub -system -noupdate -release=main -confopt "--prefix=$INSTALLDIR/gnu_debug" -build "gnu_debug" -checktool "/usr/local/bin/valgrind --tool=memcheck --num-callers=50 --leak-check=yes --track-fds=yes --log-file=$INSTALLDIR/gnu_valgrind/[PROGNAME].valgrind" Appl LCS CEP MAC/{Test/Suite,GCF/GCFCommon,GCF/TM,APL/RTCCommon,APL/PAC/BeamServer,APL/PAC/BS_Protocol,APL/PAC/CAL_Protocol,APL/PAC/CalServer,APL/PIC/RSPDriver,APL/PIC/RSP_Protocol} Demo > $BUILDROOT/lofar17-week`date +%g%W`-gnu_valgrind.log 2>&1
+rm -rf $INSTALLDIR/gnu_valgrind/*
+autoconf_share/rub -k -noupdate -release=main -confopt "--prefix=$INSTALLDIR/gnu_debug" -build "gnu_debug" -checktool "/usr/local/bin/valgrind --tool=memcheck --num-callers=50 --leak-check=yes --track-fds=yes --log-file=$INSTALLDIR/gnu_valgrind/[PROGNAME].valgrind" Appl LCS CEP MAC Demo > $BUILDROOT/lofar17-week`date +%g%W`-gnu_valgrind.log 2>&1
 
 # GNU_DEBUG_DISTCHECK
 #
-#autoconf_share/rub -system -noupdate -release=main -confopt "--prefix=$INSTALLDIR/gnu_debug" -build "gnu_debug" -distcheck Appl LCS CEP MAC/{Test/Suite,GCF/GCFCommon,GCF/TM,APL/RTCCommon,APL/PAC/BeamServer,APL/PAC/BS_Protocol,APL/PAC/CAL_Protocol,APL/PAC/CalServer,APL/PIC/RSPDriver,APL/PIC/RSP_Protocol} Demo > $BUILDROOT/lofar17-week`date +%g%W`-gnu_distcheck.log 2>&1
+#autoconf_share/rub -k -noupdate -release=main -confopt "--prefix=$INSTALLDIR/gnu_debug" -build "gnu_debug" -distcheck Appl LCS CEP MAC/{Test/Suite,GCF/GCFCommon,GCF/TM,APL/RTCCommon,APL/PAC/BeamServer,APL/PAC/BS_Protocol,APL/PAC/CAL_Protocol,APL/PAC/CalServer,APL/PIC/RSPDriver,APL/PIC/RSP_Protocol} Demo > $BUILDROOT/lofar17-week`date +%g%W`-gnu_distcheck.log 2>&1
 
 # GNU_OPT Build
 #
 #source $INSTALLDIR/gnu_opt/lofarinit.sh
 rm -rf $INSTALLDIR/gnu_opt/*
-autoconf_share/rub -system -noupdate -release=main -confopt "--prefix=$INSTALLDIR/gnu_opt" -build "gnu_opt" Appl LCS CEP MAC/{Test/Suite,GCF/GCFCommon,GCF/TM,APL/RTCCommon,APL/PAC/BeamServer,APL/PAC/BS_Protocol,APL/PAC/CAL_Protocol,APL/PAC/CalServer,APL/PIC/RSPDriver,APL/PIC/RSP_Protocol} Demo > $BUILDROOT/lofar17-week`date +%g%W`-gnu_opt.log 2>&1
+autoconf_share/rub -k -noupdate -release=main -confopt "--prefix=$INSTALLDIR/gnu_opt" -build "gnu_opt" Appl LCS CEP MAC Demo > $BUILDROOT/lofar17-week`date +%g%W`-gnu_opt.log 2>&1
 
 # GNU_NOLOG4CPLUS
 #
 #source $INSTALLDIR/gnunew_nolog4cplus/lofarinit.sh
 rm -rf $INSTALLDIR/gnunew_nolog4cplus/*
-autoconf_share/rub -system -noupdate -release=main -confopt "--prefix=$INSTALLDIR/gnunew_nolog4cplus" -build "gnunew_nolog4cplus" Appl LCS CEP Demo > $BUILDROOT/lofar17-week`date +%g%W`-gnunew_nolog4cplus.log 2>&1
+autoconf_share/rub -k -noupdate -release=main -confopt "--prefix=$INSTALLDIR/gnunew_nolog4cplus" -build "gnunew_nolog4cplus" Appl LCS CEP Demo > $BUILDROOT/lofar17-week`date +%g%W`-gnunew_nolog4cplus.log 2>&1
 
 # GNUNEW_DEBUG
 #
 #source $INSTALLDIR/gnunew_debug/lofarinit.sh
 rm -rf $INSTALLDIR/gnunew_debug/*
-autoconf_share/rub -system -noupdate -release=main -confopt "--prefix=$INSTALLDIR/gnunew_debug" -build "gnunew_debug" Appl LCS CEP MAC/{Test/Suite,GCF/GCFCommon,GCF/TM,APL/RTCCommon,APL/PAC/BeamServer,APL/PAC/BS_Protocol,APL/PAC/CAL_Protocol,APL/PAC/CalServer,APL/PIC/RSPDriver,APL/PIC/RSP_Protocol} Demo > $BUILDROOT/lofar17-week`date +%g%W`-gnunew.log 2>&1
+autoconf_share/rub -k -noupdate -release=main -confopt "--prefix=$INSTALLDIR/gnunew_debug" -build "gnunew_debug" Appl LCS CEP MAC Demo > $BUILDROOT/lofar17-week`date +%g%W`-gnunew.log 2>&1
 
 # GNU_MPICH
 #
 #source $INSTALLDIR/gnu_mpich/lofarinit.sh
 rm -rf $INSTALLDIR/gnu_mpich/*
-autoconf_share/rub -system -noupdate -release=main -confopt "--prefix=$INSTALLDIR/gnu_mpich" -build "gnu_mpich" LCS/Common LCS/databases/PL LCS/Transport LCS/databases/TransportPL LCS/ACC CEP/tinyCEP CEP/CEPFrame > $BUILDROOT/lofar17-week`date +%g%W`-gnu_mpich.log 2>&1
+autoconf_share/rub -k -noupdate -release=main -confopt "--prefix=$INSTALLDIR/gnu_mpich" -build "gnu_mpich" LCS/Common LCS/databases/PL LCS/Transport LCS/databases/TransportPL LCS/ACC CEP/tinyCEP CEP/CEPFrame > $BUILDROOT/lofar17-week`date +%g%W`-gnu_mpich.log 2>&1
 
 # GNU_FAKEBGL
 #
 #source $INSTALLDIR/gnu_fakebgl/lofarinit.sh
 rm -rf $INSTALLDIR/gnu_fakebgl/*
-autoconf_share/rub -system -noupdate -release=main -confopt "--prefix=$INSTALLDIR/gnu_fakebgl" -build "gnu_fakebgl" LCS/Common LCS/Transport CEP/tinyCEP > $BUILDROOT/lofar17-week`date +%g%W`-gnu_fakebgl.log 2>&1
+autoconf_share/rub -k -noupdate -release=main -confopt "--prefix=$INSTALLDIR/gnu_fakebgl" -build "gnu_fakebgl" LCS/Common LCS/Transport CEP/tinyCEP > $BUILDROOT/lofar17-week`date +%g%W`-gnu_fakebgl.log 2>&1
 
 # ICC_DEBUG
 #
@@ -86,11 +85,11 @@ export DOXYGEN="/usr/local/doxygen/bin/doxygen";make docxx  PACKAGES="LCS CEP MA
 cd $BUILDROOT
 
 #Prepare the buildresults on lofar0
-LOFAR/autoconf_share/scanBuildLog -d LOFAR -f lofar17-week`date +%g%W`-
+LOFAR/autoconf_share/scanBuildLog -d LOFAR -f build.`uname -n`.
 
 
 #Prepare the buildresults op dop40
-LOFAR/autoconf_share/scanBuildLog -d LOFAR -f lofar17-week`date +%g%W`- -t lofarsw@dop40.astron.nl -s software
+LOFAR/autoconf_share/scanBuildLog -d LOFAR -f build.`uname -n`. -t lofarsw@dop40.astron.nl -s software
 
 # To do b4 copied to lofar.org:
 cd $INSTALLDIR/docxxhtml;./installdox -l doxygen.tag@http://www.lofar.org/software/docxxhtml/doxygen > /dev/null