diff --git a/Makefile b/Makefile
index 7ffec54c3..6325bed89 100644
--- a/Makefile
+++ b/Makefile
@@ -60,14 +60,7 @@ ifndef BINARY_TAG
   endif
 endif
 
-# Check if we are building against dbg libs and add flag
-$(info $(BINARY_TAG))
-DEBUG = $(findstring dbg, $(BINARY_TAG))
-
-ifeq ($(DEBUG),dbg)
-  override CMAKEFLAGS += -DCMAKE_BUILD_TYPE=Debug
-endif
-
+override CMAKEFLAGS += -DCMAKE_BUILD_TYPE=$(BUILDTYPE)
 BUILDDIR := $(CURDIR)/build.$(BINARY_TAG)
 
 
diff --git a/init.sh b/init.sh
index dbaa8b7f7..fa9e6cf35 100755
--- a/init.sh
+++ b/init.sh
@@ -1,29 +1,34 @@
 #!/bin/sh -u
 if [ -z "$BUILDTYPE" ]; then
-    export BUILDTYPE=opt
+    export BUILD=opt
+    export BUILDTYPE=Release
+elif [ "$BUILDTYPE" == "Release" ]; then
+    export BUILD=opt
+else
+    export BUILD=dbg
 fi
 
-source /afs/cern.ch/lhcb/software/releases/LBSCRIPTS/LBSCRIPTS_v8r5p7/InstallArea/scripts/LbLogin.sh --cmtconfig x86_64-slc6-gcc49-$BUILDTYPE
+source /afs/cern.ch/lhcb/software/releases/LBSCRIPTS/LBSCRIPTS_v8r5p7/InstallArea/scripts/LbLogin.sh --cmtconfig x86_64-slc6-gcc49-$BUILD
 # The LbLogin sets VERBOSE to 1 which increases the compilation output. If you want details et this to 1 by hand.
 export VERBOSE=
 
 # source /afs/cern.ch/sw/lcg/views/LCG_83/x86_64-slc6-gcc49-opt/setup.sh
 
-export FCCEDM=/afs/cern.ch/exp/fcc/sw/0.7/fcc-edm/0.3/x86_64-slc6-gcc49-$BUILDTYPE/
-export PODIO=/afs/cern.ch/exp/fcc/sw/0.7/podio/0.3/x86_64-slc6-gcc49-$BUILDTYPE
+export FCCEDM=/afs/cern.ch/exp/fcc/sw/0.7/fcc-edm/0.3/x86_64-slc6-gcc49-$BUILD/
+export PODIO=/afs/cern.ch/exp/fcc/sw/0.7/podio/0.3/x86_64-slc6-gcc49-$BUILD
 export DELPHES_DIR=/afs/cern.ch/exp/fcc/sw/0.7/Delphes/3.3.2/x86_64-slc6-gcc49-opt
-export PYTHIA_DIR=/afs/cern.ch/sw/lcg/releases/LCG_80/MCGenerators/pythia8/212/x86_64-slc6-gcc49-$BUILDTYPE/
+export PYTHIA_DIR=/afs/cern.ch/sw/lcg/releases/LCG_80/MCGenerators/pythia8/212/x86_64-slc6-gcc49-$BUILD/
 
 export CMAKE_PREFIX_PATH=$FCCEDM:$PODIO:$DELPHES_DIR:/afs/cern.ch/sw/lcg/releases/LCG_83:$CMAKE_PREFIX_PATH:$PYTHIA_DIR
 
 # set up Pythia8 Index.xml
-export PYTHIA8_XML=/afs/cern.ch/sw/lcg/releases/LCG_80/MCGenerators/pythia8/212/x86_64-slc6-gcc49-$BUILDTYPE/share/Pythia8/xmldoc
+export PYTHIA8_XML=/afs/cern.ch/sw/lcg/releases/LCG_80/MCGenerators/pythia8/212/x86_64-slc6-gcc49-$BUILD/share/Pythia8/xmldoc
 
 
 
 # add DD4hep
 export inithere=$PWD
-cd /afs/cern.ch/exp/fcc/sw/0.7/DD4hep/20152311/x86_64-slc6-gcc49-$BUILDTYPE
+cd /afs/cern.ch/exp/fcc/sw/0.7/DD4hep/20152311/x86_64-slc6-gcc49-$BUILD
 source bin/thisdd4hep.sh
 cd $inithere