diff --git a/templates/concurrency_view/msp430_freertos_gpr/node.tmplt b/templates/concurrency_view/msp430_freertos_gpr/node.tmplt
index c095937b826709c0ccb415e553e678be88421e95..1b712210b37ce6b412c1ea7eac2d9c2d14e78aea 100644
--- a/templates/concurrency_view/msp430_freertos_gpr/node.tmplt
+++ b/templates/concurrency_view/msp430_freertos_gpr/node.tmplt
@@ -13,7 +13,7 @@
 all: partitions
 
 partitions: freertos
-	gprbuild -p -P @_LOWER:Partition_Names_@.gpr -XCFG="Release" -cargs:C -DSTATIC=""
+	gprbuild -R -p -P @_LOWER:Partition_Names_@.gpr -XCFG="Release" -cargs:C -DSTATIC=""
 
 freertos:
 	sh gather_freertos_files.sh
diff --git a/templates/concurrency_view/msp430_freertos_gpr/partition.tmplt b/templates/concurrency_view/msp430_freertos_gpr/partition.tmplt
index 0715679ce1ccc4dc037a0b6eef8515834b61ad91..9c96e028d917e8258e5e4d52898952d9a9f6894c 100644
--- a/templates/concurrency_view/msp430_freertos_gpr/partition.tmplt
+++ b/templates/concurrency_view/msp430_freertos_gpr/partition.tmplt
@@ -89,7 +89,7 @@ project @_CAPITALIZE:Name_@ is
       case Build is
          when "Release" =>
             for Default_Switches ("C") use
-               ("-I/opt/ti/msp430-gcc/include/",
+               ("-I/opt/msp430-gcc/include/",
                 "-I.",
                 "-I../FreeRTOS/Source/include",
                 "-I../FreeRTOS/Source/portable/GCC/MSP430FR5969",
@@ -113,7 +113,7 @@ project @_CAPITALIZE:Name_@ is
                 & external_as_list("USER_CFLAGS", " ");
          when "Debug" =>
             for Default_Switches ("C") use
-               ("-I/opt/ti/msp430-gcc/include/",
+               ("-I/opt/msp430-gcc/include/",
                 "-I.",
                 "-I../FreeRTOS/Source/include",
                 "-I../FreeRTOS/Source/portable/GCC/MSP430FR5969",
@@ -141,8 +141,8 @@ project @_CAPITALIZE:Name_@ is
       for Driver use "msp430-elf-gcc";
 
       for Default_Switches ("C") use
-         ("-L/opt/ti/msp430-gcc/include/",
-          "-I/opt/ti/msp430-gcc/include/",
+         ("-L/opt/msp430-gcc/include/",
+          "-I/opt/msp430-gcc/include/",
           "-I.",
           "-I../FreeRTOS/Source/include",
           "-I../FreeRTOS/Source/portable/GCC/MSP430FR5969",