diff --git a/Tools/Firmware/CMakeLists.txt b/Tools/Firmware/CMakeLists.txt
index 3696159c..1210569c 100644
--- a/Tools/Firmware/CMakeLists.txt
+++ b/Tools/Firmware/CMakeLists.txt
@@ -7,9 +7,6 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 set(ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../..)
 
-## TODO: Make this configurable via build script
-Set(MODEL_NAME testmodel1)
-
 include_directories(
     ## Common Includes ##
     ${ROOT_DIR}/Common/Inc
diff --git a/Tools/default_config.txt b/Tools/default_config.txt
index e4851025..c8a05a60 100644
--- a/Tools/default_config.txt
+++ b/Tools/default_config.txt
@@ -2,6 +2,7 @@
 
 COMPILE_TYPE="Firmware"
 PLATFORM="nucleol552zeq"
+MODEL_NAME="testmodel1"
 
 # --- Compile settings end ---
 
diff --git a/Tools/tools.bash b/Tools/tools.bash
index a2075bf0..35400b43 100644
--- a/Tools/tools.bash
+++ b/Tools/tools.bash
@@ -51,7 +51,7 @@ if [[ $# -eq 0 ]]; then
 elif [[ $1 == "compile" ]]; then
     RUN_TEST=false
     CLEAN=false   
-    shift 1 && while getopts :t:p:c opt
+    shift 1 && while getopts :t:p:m:c opt
     do
         case ${opt} in
             t) 
@@ -60,6 +60,9 @@ elif [[ $1 == "compile" ]]; then
             p) 
                 PLATFORM=${OPTARG}
                 ;;
+            m) 
+                MODEL_NAME=${OPTARG}
+                ;;
             c) 
             CLEAN=true
             ;;
@@ -114,7 +117,7 @@ if [[ $RUN_TEST == false ]]; then
     echo "Building ZeroPilot for $(echo $COMPILE_TYPE | tr '[:upper:]' '[:lower:]')."  
     COMPILE_DIR="$SCRIPT_PATH/$COMPILE_TYPE/build" 
     if [[ $COMPILE_TYPE == "Firmware" ]]; then
-        echo "Building for $PLATFORM."
+        echo "Building for platform $PLATFORM and model $MODEL_NAME."
     fi 
     if [[ $CLEAN == true ]]; then
         echo "Cleaning old $(echo $COMPILE_TYPE | tr '[:upper:]' '[:lower:]') build environment."
@@ -131,6 +134,7 @@ if [[ $RUN_TEST == false ]]; then
                 -G "${GENERATOR}" \
                 -DCMAKE_BUILD_TYPE="Debug" \
                 -DCMAKE_TOOLCHAIN_FILE="../../../Boardfiles/$PLATFORM/$PLATFORM.cmake" \
+                -DMODEL_NAME="$MODEL_NAME" \
                 -Wdev \
                 -Wdeprecated \
                 ../
diff --git a/Tools/tools.ps1 b/Tools/tools.ps1
index 221e0943..9493b59e 100644
--- a/Tools/tools.ps1
+++ b/Tools/tools.ps1
@@ -8,7 +8,8 @@ param(
     [string] $t,
     [string] $p,
     [switch] $c,
-    [string] $f
+    [string] $f,
+    [string] $m
 )
 
 # read defaults from file, and set variable intial value
@@ -29,6 +30,7 @@ foreach($line in Get-Content "$PSScriptRoot/default_config.txt") {
 $COMPILE_TYPE = if ($t) {$t} else {$COMPILE_TYPE}
 $PLATFORM = if ($p) {$p} else {$PLATFORM}
 $TEST_FILTER = if ($f) {$f} else {$TEST_FILTER}
+$MODEL_NAME = if ($m) {$m} else {$MODEL_NAME}
 
 
 # ====================
@@ -61,7 +63,7 @@ if($FUNCTION -eq "compile") {
     Write-Host "Building ZeroPilot for $($COMPILE_TYPE.ToLower())."
     $COMPILE_DIR = "$PSScriptRoot/$COMPILE_TYPE/build"
     if($COMPILE_TYPE -eq "Firmware") {
-        Write-Host "Building for $PLATFORM."
+        Write-Host "Building for platform $PLATFORM and model $MODEL_NAME."
     }
     if($c) {
         Write-Host "Cleaning old $($COMPILE_TYPE.ToLower()) build environment."
@@ -77,6 +79,7 @@ if($FUNCTION -eq "compile") {
                 -G "${GENERATOR}" `
                 -DCMAKE_BUILD_TYPE="Debug" `
                 -DCMAKE_TOOLCHAIN_FILE="../../../Boardfiles/$PLATFORM/$PLATFORM.cmake" `
+                -DMODEL_NAME="$MODEL_NAME" `
                 -Wdev `
                 -Wdeprecated `
                 ..