diff --git a/Makefile b/Makefile
index 04d4532..f43836c 100644
--- a/Makefile
+++ b/Makefile
@@ -10,11 +10,11 @@ LDFLAGS = -L./ext/raylib/src -lraylib -lm -lpthread -ldl -lrt -lX11
 
 # Directories
 SRC_DIR = src
-BUILD_DIR = build
+BUILD_DIR ?= build
 RAYLIB_DIR = ext/raylib/src
-TARGET = orbit_sim
+TARGET = ${BUILD_DIR}/orbit_sim
 TEST_DIR = tests
-TEST_TARGET = orbit_test
+TEST_TARGET = ${BUILD_DIR}/orbit_test
 
 # Source files (exclude old mission planning files)
 CPP_SOURCES := $(wildcard $(SRC_DIR)/*.cpp)