diff --git a/Ghidra/RuntimeScripts/Linux/support/gdbGADPServerRun b/Ghidra/RuntimeScripts/Linux/support/gdbGADPServerRun
index 85bec25c73..52f77d7b60 100755
--- a/Ghidra/RuntimeScripts/Linux/support/gdbGADPServerRun
+++ b/Ghidra/RuntimeScripts/Linux/support/gdbGADPServerRun
@@ -16,4 +16,4 @@ SCRIPT_FILE="$(readlink -f "$0" 2>/dev/null || readlink "$0" 2>/dev/null || echo
 SCRIPT_DIR="${SCRIPT_FILE%/*}"
 
 # Launch Ghidra
-"${SCRIPT_DIR}"/launch.sh fg jdk GdbAgent "${MAXMEM}" "" agent.gdb.gadp.GdbGadpServerLaunchShim --gadp-args -H localhost -p 0 -g /usr/bin/gdb
+"${SCRIPT_DIR}"/launch.sh fg jdk GdbAgent "${MAXMEM}" "" agent.gdb.gadp.GdbGadpServerLaunchShim $@
diff --git a/Ghidra/RuntimeScripts/Windows/support/dbgengGADPServerRun.bat b/Ghidra/RuntimeScripts/Windows/support/dbgengGADPServerRun.bat
index 2223462406..58747dbeb6 100644
--- a/Ghidra/RuntimeScripts/Windows/support/dbgengGADPServerRun.bat
+++ b/Ghidra/RuntimeScripts/Windows/support/dbgengGADPServerRun.bat
@@ -7,5 +7,5 @@ setlocal
 :: the physical memory available to the OS. Uncomment MAXMEM setting if non-default value is needed.
 ::set MAXMEM=2G
 
-call "%~dp0launch.bat" fg jdk DbgEngAgent "%MAXMEM%" "" agent.dbgeng.gadp.DbgEngGadpServerLaunchShim -H localhost -p 0
+call "%~dp0launch.bat" fg jdk DbgEngAgent "%MAXMEM%" "" agent.dbgeng.gadp.DbgEngGadpServerLaunchShim %*
 
diff --git a/Ghidra/RuntimeScripts/Windows/support/dbgmodelGADPServerRun.bat b/Ghidra/RuntimeScripts/Windows/support/dbgmodelGADPServerRun.bat
index eb360d3c2c..163a00c823 100644
--- a/Ghidra/RuntimeScripts/Windows/support/dbgmodelGADPServerRun.bat
+++ b/Ghidra/RuntimeScripts/Windows/support/dbgmodelGADPServerRun.bat
@@ -7,5 +7,5 @@ setlocal
 :: the physical memory available to the OS. Uncomment MAXMEM setting if non-default value is needed.
 ::set MAXMEM=2G
 
-call "%~dp0launch.bat" fg jdk DbgEngAgent "%MAXMEM%" "" agent.dbgmodel.gadp.DbgModelGadpServerLaunchShim -H localhost -p 0
+call "%~dp0launch.bat" fg jdk DbgEngAgent "%MAXMEM%" "" agent.dbgmodel.gadp.DbgModelGadpServerLaunchShim %*