diff --git a/Software/firmware/helper/build.sh b/Software/firmware/helper/build.sh
index 99a4607..f94bcf5 100755
--- a/Software/firmware/helper/build.sh
+++ b/Software/firmware/helper/build.sh
@@ -17,7 +17,7 @@ CMAKE_TOOLCHAIN_FILE_SIMULATION="${CMAKE_TOOLCHAIN_FILES_ROOT}/target.simulation
 CMAKE_TOOLCHAIN_FILE_MAINUNIT="${CMAKE_TOOLCHAIN_FILES_ROOT}/target.mainunit"
 
 #build stuff
-BUILD_ROOT="${SOFTWARE_ROOT}/build"
+BUILD_ROOT="${BASEDIR}/../../../../build_womolin" # out of repo build
 BUILD_SIMULATION_ROOT="${BUILD_ROOT}/simulation"
 BUILD_MAINUNIT_ROOT="${BUILD_ROOT}/mainunit"
 DEBUG="debug"
diff --git a/Software/firmware/helper/clean.sh b/Software/firmware/helper/clean.sh
index d9bb581..6d5539e 100755
--- a/Software/firmware/helper/clean.sh
+++ b/Software/firmware/helper/clean.sh
@@ -8,4 +8,4 @@ else
    BASEDIR=${PWD}/`dirname "${0}"`
 fi
 
-rm -fr ${BASEDIR}/../../build
+rm -fr ${BASEDIR}/../../../../build_womolin
diff --git a/Software/firmware/helper/version.sh b/Software/firmware/helper/version.sh
index 52d047a..75f0ee8 100755
--- a/Software/firmware/helper/version.sh
+++ b/Software/firmware/helper/version.sh
@@ -2,6 +2,8 @@
 
 cp $1/$3 $2/$3
 
+cd $1
+
 if [[ `git status --short` || `git diff origin/master` ]]; then
    GIT_HASH="NO_HASH"
    RELEASE="LOCAL"