diff --git a/device.mk b/device.mk
index 2afc6f86..4a844887 100644
--- a/device.mk
+++ b/device.mk
@@ -588,7 +588,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
 
 # Copy Camera HFD Setfiles
diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
index 3663ce02..a03ad1c9 100644
--- a/dumpstate/DumpstateDevice.cpp
+++ b/dumpstate/DumpstateDevice.cpp
@@ -266,7 +266,7 @@ DumpstateDevice::DumpstateDevice()
         { "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); } },
         { "camera", [this](int fd) { dumpCameraSection(fd); } },
         { "trusty", [this](int fd) { dumpTrustySection(fd); } },
         { "modem", [this](int fd) { dumpModemSection(fd); } },
@@ -1056,11 +1056,9 @@ void DumpstateDevice::dumpMiscSection(int fd) {
     DumpFileToFd(fd, "VENDOR PROC DUMP", "/proc/vendor_sched/dump_task");
 }
 
-// Dump items related to GSC
-void DumpstateDevice::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 DumpstateDevice::dumpSection(int fd) {
+    RunCommandToFd(fd, "dump", {"/vendor/bin/dump/dump_gsc.sh"});
 }
 
 // Dump essential camera debugging logs
diff --git a/dumpstate/DumpstateDevice.h b/dumpstate/DumpstateDevice.h
index 5cc32491..bbd523a0 100644
--- a/dumpstate/DumpstateDevice.h
+++ b/dumpstate/DumpstateDevice.h
@@ -76,7 +76,7 @@ struct DumpstateDevice : public IDumpstateDevice {
     void dumpAoCSection(int fd);
     void dumpRamdumpSection(int fd);
     void dumpMiscSection(int fd);
-    void dumpGscSection(int fd);
+    void dumpSection(int fd);
     void dumpCameraSection(int fd);
     void dumpTrustySection(int fd);
     void dumpModemSection(int fd);