diff --git a/build.sh b/build.sh
index da7f2b9..70ef379 100755
--- a/build.sh
+++ b/build.sh
@@ -11,7 +11,7 @@ if [[ $REBUILD =~ ^[Yy]$ ]]; then
     cp -r build/gsd_orangecrab/doc/_build/html docs/ && echo "Copied docs to project root"
 else echo "Skipping Rebuild"
 fi
-BUILD_DIR=`realpath -eL build/gsd_orangecrab/` WITH_CXX=1 make -C demo && echo "Built demo files"
+make -C demo && echo "Built demo files"
 mv demo/demo.bin kernel.bin && echo "Moved kernel binary to project root"
 rm -f demo/*.o demo/*.d demo/demo.elf demo/demo.elf.map && echo "Cleaned up build artifacts"
 read -p "Flash OrangeCrab? [y/N]" -n 1 -r FLASH_OC
diff --git a/demo/Makefile b/demo/Makefile
index a5d1d82..96da1d5 100644
--- a/demo/Makefile
+++ b/demo/Makefile
@@ -1,4 +1,4 @@
-BUILD_DIR?=../build/
+BUILD_DIR?=../build/gsd_orangecrab/
 
 include $(BUILD_DIR)/software/include/generated/variables.mak
 include $(SOC_DIRECTORY)/software/common.mak