diff --git a/software/firmware/.cproject b/software/firmware/.cproject
index a7b5ee9b..b45a9da1 100644
--- a/software/firmware/.cproject
+++ b/software/firmware/.cproject
@@ -18,7 +18,7 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="${ProjName}" buildProperties="" description="" id="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base.1790597438" name="Default" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.dockerdpath=,org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=" parent="org.eclipse.cdt.build.core.emptycfg">
+				<configuration artifactName="${ProjName}" buildProperties="" description="" id="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base.1790597438" name="Default" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.dockerdpath=,org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=" parent="org.eclipse.cdt.build.core.emptycfg">
 					<folderInfo id="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base.1790597438.1033093985" name="/" resourcePath="">
 						<toolChain id="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base.1406672748" name="Arm Cross GCC" superClass="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base">
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.275751269" name="Architecture" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.architecture" value="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.arm" valueType="enumerated"/>
diff --git a/software/firmware/.settings/language.settings.xml b/software/firmware/.settings/language.settings.xml
index 49bbe7e6..73035b0b 100644
--- a/software/firmware/.settings/language.settings.xml
+++ b/software/firmware/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1347002660722691700" id="org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Arm Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-339510081203349785" id="org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Arm Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/software/firmware/AmbiqSDK/bsp/apollo4_blue/linker/socitrack.ld b/software/firmware/AmbiqSDK/bsp/apollo4_blue/linker/socitrack.ld
index d13aa7f0..9efdf9cf 100644
--- a/software/firmware/AmbiqSDK/bsp/apollo4_blue/linker/socitrack.ld
+++ b/software/firmware/AmbiqSDK/bsp/apollo4_blue/linker/socitrack.ld
@@ -25,7 +25,7 @@ SECTIONS
         KEEP(*(.isr_vector))
         KEEP(*(.patch))
         . = ALIGN(4);
-	}
+	} > MCU_MRAM
 
     .text :
     {
@@ -39,7 +39,6 @@ SECTIONS
         *(.rodata)
         *(.rodata*)
         . = ALIGN(4);
-        _etext = .;
     } > MCU_MRAM
     
     .ARM.exidx :
@@ -49,24 +48,8 @@ SECTIONS
         __exidx_end = .;
     } > MCU_MRAM
 
-    /* User stack section initialized by startup code. */
-    .stack (NOLOAD):
-    {
-        . = ALIGN(8);
-        *(.stack)
-        *(.stack*)
-        . = ALIGN(8);
-    } > MCU_TCM
-
-    .heap : {
-        __heap_start__ = .;
-        end = __heap_start__;
-        _end = end;
-        __end = end;
-        KEEP(*(.heap))
-        __heap_end__ = .;
-        __HeapLimit = __heap_end__;
-    } > MCU_TCM
+    . = ALIGN(8);
+    _etext = .;
 
     .data :
     {
@@ -81,7 +64,7 @@ SECTIONS
     /* used by startup to initialize data */
     _init_data = LOADADDR(.data);
 
-    .bss :
+    .bss (NOLOAD):
     {
         . = ALIGN(4);
         _sbss = .;
@@ -92,13 +75,26 @@ SECTIONS
         _ebss = .;
     } > MCU_TCM
 
-    .shared :
+    .heap (NOLOAD):
     {
-        . = ALIGN(4);
-        KEEP(*(.resource_table))
-        KEEP(*(.shared))
-        . = ALIGN(4);
-    } > SHARED_SRAM AT>MCU_MRAM
+        __heap_start__ = .;
+        end = __heap_start__;
+        _end = end;
+        __end = end;
+        KEEP(*(.heap))
+        __heap_end__ = .;
+        __HeapLimit = __heap_end__;
+    } > MCU_TCM
+
+    /* User stack section initialized by startup code. */
+    .stack (NOLOAD):
+    {
+        . = ALIGN(8);
+        *(.stack)
+        *(.stack*)
+        . = ALIGN(8);
+    } > MCU_TCM
+
     .ARM.attributes 0 : { *(.ARM.attributes) }
 }
 
diff --git a/software/firmware/AmbiqSDK/bsp/apollo4_blue/linker/startup_gcc.c b/software/firmware/AmbiqSDK/bsp/apollo4_blue/linker/startup_gcc.c
index 868994b9..444fbad6 100644
--- a/software/firmware/AmbiqSDK/bsp/apollo4_blue/linker/startup_gcc.c
+++ b/software/firmware/AmbiqSDK/bsp/apollo4_blue/linker/startup_gcc.c
@@ -153,9 +153,6 @@ extern int main(void);
 __attribute__ ((section(".stack")))
 static uint32_t g_pui32Stack[0xac0];
 
-__attribute__ ((section(".heap"))) __attribute__ ((__used__))
-static uint32_t g_pui32Heap[0];
-
 //*****************************************************************************
 //
 // The vector table.
diff --git a/software/firmware/AmbiqSDK/bsp/apollo4_blue_pro/linker/socitrack.ld b/software/firmware/AmbiqSDK/bsp/apollo4_blue_pro/linker/socitrack.ld
index 38c5bdcb..2216e768 100644
--- a/software/firmware/AmbiqSDK/bsp/apollo4_blue_pro/linker/socitrack.ld
+++ b/software/firmware/AmbiqSDK/bsp/apollo4_blue_pro/linker/socitrack.ld
@@ -25,7 +25,7 @@ SECTIONS
         KEEP(*(.isr_vector))
         KEEP(*(.patch))
         . = ALIGN(4);
-	}
+	} > MCU_MRAM
 
     .text :
     {
@@ -39,7 +39,6 @@ SECTIONS
         *(.rodata)
         *(.rodata*)
         . = ALIGN(4);
-        _etext = .;
     } > MCU_MRAM
 
     .ARM.exidx :
@@ -48,26 +47,9 @@ SECTIONS
         *(.ARM.exidx* .gnu.linkonce.armexidx.*)
         __exidx_end = .;
     } > MCU_MRAM
-    _etext = .;
-
-    /* User stack section initialized by startup code. */
-    .stack (NOLOAD):
-    {
-        . = ALIGN(8);
-        *(.stack)
-        *(.stack*)
-        . = ALIGN(8);
-    } > MCU_TCM
 
-    .heap (NOLOAD): {
-        __heap_start__ = .;
-        end = __heap_start__;
-        _end = end;
-        __end = end;
-        KEEP(*(.heap))
-        __heap_end__ = .;
-        __HeapLimit = __heap_end__;
-    } > MCU_TCM
+    . = ALIGN(8);
+    _etext = .;
 
     .data :
     {
@@ -75,7 +57,6 @@ SECTIONS
         _sdata = .;
         *(.data)
         *(.data*)
-        *(.ramfunc)
         . = ALIGN(4);
         _edata = .;
     } > MCU_TCM AT>MCU_MRAM
@@ -83,7 +64,7 @@ SECTIONS
     /* used by startup to initialize data */
     _init_data = LOADADDR(.data);
 
-    .bss :
+    .bss (NOLOAD):
     {
         . = ALIGN(4);
         _sbss = .;
@@ -94,13 +75,26 @@ SECTIONS
         _ebss = .;
     } > MCU_TCM
 
-    .shared (NOLOAD):
+    .heap (NOLOAD):
     {
-        . = ALIGN(4);
-        KEEP(*(.resource_table))
-        KEEP(*(.shared))
-        . = ALIGN(4);
-    } > SHARED_SRAM AT>MCU_MRAM
+        __heap_start__ = .;
+        end = __heap_start__;
+        _end = end;
+        __end = end;
+        KEEP(*(.heap))
+        __heap_end__ = .;
+        __HeapLimit = __heap_end__;
+    } > MCU_TCM
+
+    /* User stack section initialized by startup code. */
+    .stack (NOLOAD):
+    {
+        . = ALIGN(8);
+        *(.stack)
+        *(.stack*)
+        . = ALIGN(8);
+    } > MCU_TCM
+
     .ARM.attributes 0 : { *(.ARM.attributes) }
 }
 
diff --git a/software/firmware/AmbiqSDK/bsp/apollo4_blue_pro/linker/startup_gcc.c b/software/firmware/AmbiqSDK/bsp/apollo4_blue_pro/linker/startup_gcc.c
index 868994b9..444fbad6 100644
--- a/software/firmware/AmbiqSDK/bsp/apollo4_blue_pro/linker/startup_gcc.c
+++ b/software/firmware/AmbiqSDK/bsp/apollo4_blue_pro/linker/startup_gcc.c
@@ -153,9 +153,6 @@ extern int main(void);
 __attribute__ ((section(".stack")))
 static uint32_t g_pui32Stack[0xac0];
 
-__attribute__ ((section(".heap"))) __attribute__ ((__used__))
-static uint32_t g_pui32Heap[0];
-
 //*****************************************************************************
 //
 // The vector table.