diff --git a/lgsm/config-default/config-lgsm/mcserver/_default.cfg b/lgsm/config-default/config-lgsm/mcserver/_default.cfg
index b78195e3e..81e833d6e 100644
--- a/lgsm/config-default/config-lgsm/mcserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/mcserver/_default.cfg
@@ -14,6 +14,7 @@ javaram="1024" # -Xmx$1024M
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
 fn_parms(){
 parms="nogui"
+executable="java -Xmx${javaram}M -jar ${jarfile}"
 }
 
 ## Release Settings | https://docs.linuxgsm.com/game-servers/minecraft#release-settings
@@ -151,7 +152,8 @@ glibc="null"
 ## Game Server Directories
 systemdir="${serverfiles}"
 executabledir="${serverfiles}"
-executable="java -Xmx${javaram}M -jar ${serverfiles}/minecraft_server.jar"
+jarfile="${serverfiles}/minecraft_server.jar"
+executable="${jarfile}"
 servercfgdir="${systemdir}"
 servercfg="server.properties"
 servercfgdefault="server.properties"
diff --git a/lgsm/config-default/config-lgsm/secrets-common-template.cfg b/lgsm/config-default/config-lgsm/secrets-common-template.cfg
new file mode 100644
index 000000000..d8ded6aa9
--- /dev/null
+++ b/lgsm/config-default/config-lgsm/secrets-common-template.cfg
@@ -0,0 +1,5 @@
+##################################
+######## Common Secrets ##########
+##################################
+# PLACE GLOBAL SECRET SETTINGS HERE
+## These settings will apply to all instances.
diff --git a/lgsm/config-default/config-lgsm/secrets-instance-template.cfg b/lgsm/config-default/config-lgsm/secrets-instance-template.cfg
new file mode 100644
index 000000000..5446d3718
--- /dev/null
+++ b/lgsm/config-default/config-lgsm/secrets-instance-template.cfg
@@ -0,0 +1,5 @@
+##################################
+####### Instance Secrets #########
+##################################
+# PLACE INSTANCE SECRET SETTINGS HERE
+## These settings will apply to a specific instance.
diff --git a/linuxgsm.sh b/linuxgsm.sh
index 4815e86e3..cb767a770 100755
--- a/linuxgsm.sh
+++ b/linuxgsm.sh
@@ -412,6 +412,15 @@ else
 			# shellcheck source=/dev/null
 			source "${configdirserver}/common.cfg"
 		fi
+		# Load the secrets-common.cfg config. If missing download it.
+		if [ ! -f "${configdirserver}/secrets-common.cfg" ]; then
+			fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-common-template.cfg" "${configdirserver}" "secrets-common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nomd5"
+			# shellcheck source=/dev/null
+			source "${configdirserver}/secrets-common.cfg"
+		else
+			# shellcheck source=/dev/null
+			source "${configdirserver}/secrets-common.cfg"
+		fi
 		# Load the instance.cfg config. If missing download it.
 		if [ ! -f "${configdirserver}/${selfname}.cfg" ]; then
 			fn_fetch_config "lgsm/config-default/config-lgsm" "instance-template.cfg" "${configdirserver}" "${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nomd5"
@@ -421,6 +430,15 @@ else
 			# shellcheck source=/dev/null
 			source "${configdirserver}/${selfname}.cfg"
 		fi
+		# Load the secrets-instance.cfg config. If missing download it.
+		if [ ! -f "${configdirserver}/secrets-${selfname}.cfg" ]; then
+			fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-instance-template.cfg" "${configdirserver}" "secrets-${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nomd5"
+			# shellcheck source=/dev/null
+			source "${configdirserver}/secrets-${selfname}.cfg"
+		else
+			# shellcheck source=/dev/null
+			source "${configdirserver}/secrets-${selfname}.cfg"
+		fi
 
 		# Load the linuxgsm.sh in to tmpdir. If missing download it.
 		if [ ! -f "${tmpdir}/linuxgsm.sh" ]; then
diff --git a/tests/tests_fctrserver.sh b/tests/tests_fctrserver.sh
index 1afa2f60a..55a05f99f 100644
--- a/tests/tests_fctrserver.sh
+++ b/tests/tests_fctrserver.sh
@@ -421,6 +421,15 @@ else
 			# shellcheck source=/dev/null
 			source "${configdirserver}/common.cfg"
 		fi
+		# Load the secrets-common.cfg config. If missing download it.
+		if [ ! -f "${configdirserver}/secrets-common.cfg" ]; then
+			fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-common-template.cfg" "${configdirserver}" "secrets-common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nomd5"
+			# shellcheck source=/dev/null
+			source "${configdirserver}/secrets-common.cfg"
+		else
+			# shellcheck source=/dev/null
+			source "${configdirserver}/secrets-common.cfg"
+		fi
 		# Load the instance.cfg config. If missing download it.
 		if [ ! -f "${configdirserver}/${selfname}.cfg" ]; then
 			fn_fetch_config "lgsm/config-default/config-lgsm" "instance-template.cfg" "${configdirserver}" "${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nomd5"
@@ -430,6 +439,15 @@ else
 			# shellcheck source=/dev/null
 			source "${configdirserver}/${selfname}.cfg"
 		fi
+		# Load the secrets-instance.cfg config. If missing download it.
+		if [ ! -f "${configdirserver}/secrets-${selfname}.cfg" ]; then
+			fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-instance-template.cfg" "${configdirserver}" "secrets-${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nomd5"
+			# shellcheck source=/dev/null
+			source "${configdirserver}/secrets-${selfname}.cfg"
+		else
+			# shellcheck source=/dev/null
+			source "${configdirserver}/secrets-${selfname}.cfg"
+		fi
 
 		# Load the linuxgsm.sh in to tmpdir. If missing download it.
 		if [ ! -f "${tmpdir}/linuxgsm.sh" ]; then
diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh
index aab73228d..2eb1815f3 100644
--- a/tests/tests_jc2server.sh
+++ b/tests/tests_jc2server.sh
@@ -422,6 +422,15 @@ else
 			# shellcheck source=/dev/null
 			source "${configdirserver}/common.cfg"
 		fi
+		# Load the secrets-common.cfg config. If missing download it.
+		if [ ! -f "${configdirserver}/secrets-common.cfg" ]; then
+			fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-common-template.cfg" "${configdirserver}" "secrets-common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nomd5"
+			# shellcheck source=/dev/null
+			source "${configdirserver}/secrets-common.cfg"
+		else
+			# shellcheck source=/dev/null
+			source "${configdirserver}/secrets-common.cfg"
+		fi
 		# Load the instance.cfg config. If missing download it.
 		if [ ! -f "${configdirserver}/${selfname}.cfg" ]; then
 			fn_fetch_config "lgsm/config-default/config-lgsm" "instance-template.cfg" "${configdirserver}" "${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nomd5"
@@ -431,6 +440,15 @@ else
 			# shellcheck source=/dev/null
 			source "${configdirserver}/${selfname}.cfg"
 		fi
+		# Load the secrets-instance.cfg config. If missing download it.
+		if [ ! -f "${configdirserver}/secrets-${selfname}.cfg" ]; then
+			fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-instance-template.cfg" "${configdirserver}" "secrets-${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nomd5"
+			# shellcheck source=/dev/null
+			source "${configdirserver}/secrets-${selfname}.cfg"
+		else
+			# shellcheck source=/dev/null
+			source "${configdirserver}/secrets-${selfname}.cfg"
+		fi
 
 		# Load the linuxgsm.sh in to tmpdir. If missing download it.
 		if [ ! -f "${tmpdir}/linuxgsm.sh" ]; then
diff --git a/tests/tests_mcserver.sh b/tests/tests_mcserver.sh
index edfc620b3..8797e78e8 100644
--- a/tests/tests_mcserver.sh
+++ b/tests/tests_mcserver.sh
@@ -422,6 +422,15 @@ else
 			# shellcheck source=/dev/null
 			source "${configdirserver}/common.cfg"
 		fi
+		# Load the secrets-common.cfg config. If missing download it.
+		if [ ! -f "${configdirserver}/secrets-common.cfg" ]; then
+			fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-common.cfg" "${configdirserver}" "secrets-common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nomd5"
+			# shellcheck source=/dev/null
+			source "${configdirserver}/secrets-common.cfg"
+		else
+			# shellcheck source=/dev/null
+			source "${configdirserver}/secrets-common.cfg"
+		fi
 		# Load the instance.cfg config. If missing download it.
 		if [ ! -f "${configdirserver}/${selfname}.cfg" ]; then
 			fn_fetch_config "lgsm/config-default/config-lgsm" "instance-template.cfg" "${configdirserver}" "${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nomd5"
@@ -431,6 +440,15 @@ else
 			# shellcheck source=/dev/null
 			source "${configdirserver}/${selfname}.cfg"
 		fi
+		# Load the secrets-instance.cfg config. If missing download it.
+		if [ ! -f "${configdirserver}/secrets-${selfname}.cfg" ]; then
+			fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-instance-template.cfg" "${configdirserver}" "secrets-${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nomd5"
+			# shellcheck source=/dev/null
+			source "${configdirserver}/secrets-${selfname}.cfg"
+		else
+			# shellcheck source=/dev/null
+			source "${configdirserver}/secrets-${selfname}.cfg"
+		fi
 
 		# Load the linuxgsm.sh in to tmpdir. If missing download it.
 		if [ ! -f "${tmpdir}/linuxgsm.sh" ]; then
diff --git a/tests/tests_ts3server.sh b/tests/tests_ts3server.sh
index 620eb43ee..3883d8dc2 100644
--- a/tests/tests_ts3server.sh
+++ b/tests/tests_ts3server.sh
@@ -422,6 +422,15 @@ else
 			# shellcheck source=/dev/null
 			source "${configdirserver}/common.cfg"
 		fi
+		# Load the secrets-common.cfg config. If missing download it.
+		if [ ! -f "${configdirserver}/secrets-common.cfg" ]; then
+			fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-common-template.cfg" "${configdirserver}" "secrets-common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nomd5"
+			# shellcheck source=/dev/null
+			source "${configdirserver}/secrets-common.cfg"
+		else
+			# shellcheck source=/dev/null
+			source "${configdirserver}/secrets-common.cfg"
+		fi
 		# Load the instance.cfg config. If missing download it.
 		if [ ! -f "${configdirserver}/${selfname}.cfg" ]; then
 			fn_fetch_config "lgsm/config-default/config-lgsm" "instance-template.cfg" "${configdirserver}" "${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nomd5"
@@ -431,6 +440,15 @@ else
 			# shellcheck source=/dev/null
 			source "${configdirserver}/${selfname}.cfg"
 		fi
+		# Load the secrets-instance.cfg config. If missing download it.
+		if [ ! -f "${configdirserver}/secrets-${selfname}.cfg" ]; then
+			fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-instance-template.cfg" "${configdirserver}" "secrets-${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nomd5"
+			# shellcheck source=/dev/null
+			source "${configdirserver}/secrets-${selfname}.cfg"
+		else
+			# shellcheck source=/dev/null
+			source "${configdirserver}/secrets-${selfname}.cfg"
+		fi
 
 		# Load the linuxgsm.sh in to tmpdir. If missing download it.
 		if [ ! -f "${tmpdir}/linuxgsm.sh" ]; then