diff --git a/Hello_World/Makefile b/Hello_World/Makefile
index d95c515ecd6b1edaa063707a0d36dc4cdb3830b0..7fee86e9bb4b85f4cc9236a169e3430c8d92d2b5 100644
--- a/Hello_World/Makefile
+++ b/Hello_World/Makefile
@@ -111,7 +111,9 @@ PROJ_CFLAGS+=-std=c99
 #MXC_OPTIMIZE_CFLAGS=-O1
 
 # Point this variable to a linker file to override the default file
+ifneq "$(APP)" ""
 LINKERFILE=$(CMSIS_ROOT)/Device/Maxim/$(TARGET_UC)/Source/GCC/$(TARGET_LC)_app.ld
+endif
 
 ################################################################################
 # Include external library makefiles here
diff --git a/Hello_World/build_image b/Hello_World/build_image
index 7119c5c52a39b2591257db6794536bfd069e1aa2..efcda785f8ef3137326531e085cdccaa7baac919 100755
--- a/Hello_World/build_image
+++ b/Hello_World/build_image
@@ -1,5 +1,5 @@
 make clean
-make
+make APP=1
 make build/max32665.bin
 cp build/max32665.bin card10.bin
 python ../bootloader/crc_patch.py card10.bin
diff --git a/testapp/Makefile b/testapp/Makefile
index 9ecb38105743e40d1154cd6531014c1e539b3e7e..49bf141c9025f1193e3c92da588ec3a8c96a975a 100644
--- a/testapp/Makefile
+++ b/testapp/Makefile
@@ -108,7 +108,9 @@ PROJ_CFLAGS+=-std=c99
 #MXC_OPTIMIZE_CFLAGS=-O1
 
 # Point this variable to a linker file to override the default file
+ifneq "$(APP)" ""
 LINKERFILE=$(CMSIS_ROOT)/Device/Maxim/$(TARGET_UC)/Source/GCC/$(TARGET_LC)_app.ld
+endif
 
 ################################################################################
 # Include external library makefiles here
diff --git a/testapp/build_image b/testapp/build_image
index 7119c5c52a39b2591257db6794536bfd069e1aa2..efcda785f8ef3137326531e085cdccaa7baac919 100755
--- a/testapp/build_image
+++ b/testapp/build_image
@@ -1,5 +1,5 @@
 make clean
-make
+make APP=1
 make build/max32665.bin
 cp build/max32665.bin card10.bin
 python ../bootloader/crc_patch.py card10.bin