diff --git a/device.mk b/device.mk
index 1e417f33..a9597b70 100644
--- a/device.mk
+++ b/device.mk
@@ -571,6 +571,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_ramdisk.mk)
 # Titan-M
 ifeq (,$(filter true, $(BOARD_WITHOUT_DTLS)))
 include hardware/google/pixel/dauntless/dauntless.mk
+include device/google/gs-common/dauntless/gsc.mk
 endif
 
 PRODUCT_PACKAGES_DEBUG += \
diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp
index 525ba5cd..7ef46c20 100644
--- a/dumpstate/Dumpstate.cpp
+++ b/dumpstate/Dumpstate.cpp
@@ -238,7 +238,7 @@ Dumpstate::Dumpstate()
         { "aoc", [this](int fd) { dumpAoCSection(fd); } },
         { "ramdump", [this](int fd) { dumpRamdumpSection(fd); } },
         { "misc", [this](int fd) { dumpMiscSection(fd); } },
-        { "gsc", [this](int fd) { dumpGscSection(fd); } },
+        { "dump", [this](int fd) { dumpSection(fd); } },
         { "trusty", [this](int fd) { dumpTrustySection(fd); } },
     },
   mLogSections{
@@ -1118,11 +1118,9 @@ void Dumpstate::dumpMiscSection(int fd) {
     DumpFileToFd(fd, "VENDOR PROC DUMP", "/proc/vendor_sched/dump_task");
 }
 
-// Dump items related to GSC
-void Dumpstate::dumpGscSection(int fd) {
-    RunCommandToFd(fd, "Citadel VERSION", {"vendor/bin/hw/citadel_updater", "-lv"});
-    RunCommandToFd(fd, "Citadel STATS", {"vendor/bin/hw/citadel_updater", "--stats"});
-    RunCommandToFd(fd, "GSC DEBUG DUMP", {"vendor/bin/hw/citadel_updater", "-D"});
+// Dump scripts under vendor/bin/dump
+void Dumpstate::dumpSection(int fd) {
+    RunCommandToFd(fd, "dump", {"/vendor/bin/dump/dump_gsc.sh"});
 }
 
 void Dumpstate::dumpTrustySection(int fd) {
diff --git a/dumpstate/Dumpstate.h b/dumpstate/Dumpstate.h
index 1f2a5dab..89d00f3b 100644
--- a/dumpstate/Dumpstate.h
+++ b/dumpstate/Dumpstate.h
@@ -67,7 +67,7 @@ class Dumpstate : public BnDumpstateDevice {
     void dumpAoCSection(int fd);
     void dumpRamdumpSection(int fd);
     void dumpMiscSection(int fd);
-    void dumpGscSection(int fd);
+    void dumpSection(int fd);
     void dumpTrustySection(int fd);
 
     void dumpLogSection(int fd, int fdModem);