diff --git a/Ghidra/RuntimeScripts/Linux/server/svrAdmin b/Ghidra/RuntimeScripts/Linux/server/svrAdmin
index 702ca83c49..b9f40d12a4 100755
--- a/Ghidra/RuntimeScripts/Linux/server/svrAdmin
+++ b/Ghidra/RuntimeScripts/Linux/server/svrAdmin
@@ -45,8 +45,8 @@ fi
 OWNER="$(grep '^wrapper.app.account=' "${CONFIG}" | sed -e 's/^.*=\(.*\)\s*.*$/\1/')"
 
 if [ -z "${OWNER}" -o "${OWNER}" = "$(whoami)" ]; then
-	VMARGS="-DUserAdmin.invocation=$(basename "${SCRIPT_FILE}") -DUserAdmin.config=\"${CONFIG}\""
-	"${SCRIPT_DIR}"/../support/launch.sh fg svrAdmin "${MAXMEM}" "$VMARGS" ghidra.server.ServerAdmin "$@"
+	VMARGS="-DUserAdmin.invocation=$(basename "${SCRIPT_FILE}") "
+	"${SCRIPT_DIR}"/../support/launch.sh fg svrAdmin "${MAXMEM}" "$VMARGS" ghidra.server.ServerAdmin "${CONFIG}" "$@"
 else
 	echo "Running svrAdmin with $SUDO as ${OWNER} ..."
 	$SUDO -u $OWNER "$0" "$@"
diff --git a/Ghidra/RuntimeScripts/Linux/support/buildGhidraJar b/Ghidra/RuntimeScripts/Linux/support/buildGhidraJar
index 66b87cb0c2..dbe6b52e02 100755
--- a/Ghidra/RuntimeScripts/Linux/support/buildGhidraJar
+++ b/Ghidra/RuntimeScripts/Linux/support/buildGhidraJar
@@ -25,7 +25,7 @@ if [ ! -d "${GHIDRA_ROOT_DIR}" ]; then
 fi
 
 # Set required VMARGS for jar builder application
-APP_VMARGS="-DGhidraJarBuilder.Name=$(basename "${SCRIPT_FILE}") -DGhidra.Install.Root.Dir=\"${GHIDRA_ROOT_DIR}\" "
+APP_VMARGS="-DGhidraJarBuilder.Name=$(basename "${SCRIPT_FILE}") "
 
 # Launch jar builder
 "${SCRIPT_DIR}"/launch.sh "${LAUNCH_MODE}" Ghidra "${MAXMEM}" "${APP_VMARGS}" ghidra.util.GhidraJarBuilder -main ghidra.JarRun "$@"
diff --git a/Ghidra/RuntimeScripts/Windows/support/buildGhidraJar.bat b/Ghidra/RuntimeScripts/Windows/support/buildGhidraJar.bat
index d32db375c9..3f2d19e94f 100644
--- a/Ghidra/RuntimeScripts/Windows/support/buildGhidraJar.bat
+++ b/Ghidra/RuntimeScripts/Windows/support/buildGhidraJar.bat
@@ -18,6 +18,6 @@ exit /B 1
 
 :continue
 
-set APP_VMARGS=-DGhidraJarBuilder.Name=%0 -DGhidra.Install.Root.Dir=%GHIDRA_ROOT_DIR%
+set APP_VMARGS=-DGhidraJarBuilder.Name=%0
 
 call "%~dp0launch.bat" %LAUNCH_MODE% Ghidra "" "%APP_VMARGS%" ghidra.util.GhidraJarBuilder -main ghidra.JarRun %*