diff --git a/location/gnssd/Android.bp b/location/gnssd/Android.bp
index f7fb192..1774bd7 100644
--- a/location/gnssd/Android.bp
+++ b/location/gnssd/Android.bp
@@ -42,9 +42,14 @@ cc_prebuilt_binary {
     // Bypass because libhidltransport is deprecated
     // Bypass because libhwbinder is deprecated
     check_elf_files: false,
-    required: [
-        "libsighandler",
-    ],
+    product_variables: {
+        debuggable: {
+            required: [
+                "libsighandler",
+            ],
+        },
+    },
+
     init_rc: ["init.gnss.rc"],
     vintf_fragments: ["android.hardware.gnss@default.xml"],
 }
@@ -81,8 +86,14 @@ cc_prebuilt_binary {
     },
     // Bypass because libsitril-gps is Android.mk module
     check_elf_files: false,
+    product_variables: {
+        debuggable: {
+            required: [
+                "libsighandler",
+            ],
+        },
+    },
     required: [
         "libcustomgnss",
-        "libsighandler",
     ],
 }
diff --git a/location/gnssd/gnss_release.mk b/location/gnssd/gnss_release.mk
index 3e606fb..452d7d9 100644
--- a/location/gnssd/gnss_release.mk
+++ b/location/gnssd/gnss_release.mk
@@ -1,5 +1,3 @@
-# Enable coredump funtcion for all the ROM.
-$(call soong_config_set_bool,sighandler,coredump,true)
 # Enable pixel gnss hal service
 -include vendor/google/gnss/aidl_service/pixel_gnss_hal.mk
 
diff --git a/location/gnssd/release/gps_user.cfg b/location/gnssd/release/gps_user.cfg
index 7309847..ed40ec5 100644
--- a/location/gnssd/release/gps_user.cfg
+++ b/location/gnssd/release/gps_user.cfg
@@ -1,7 +1,7 @@
 GlueLayer_ToolConfigSelection=3
 debug_console=0
 debug_enable=0
-mem_dump_to_node=1
+mem_dump_to_node=0
 GlueLayer_IsGedKeyExist=1
 GlueLayer_EnableGnssCfgInterface=1
 ism_stream_enable=1