diff --git a/lgsm/config-default/config-lgsm/tfserver/_default.cfg b/lgsm/config-default/config-lgsm/tfserver/_default.cfg
index 778ef598c..438ea23d3 100644
--- a/lgsm/config-default/config-lgsm/tfserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/tfserver/_default.cfg
@@ -11,15 +11,16 @@
 ## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
 ip="0.0.0.0"
 port="7777"
-queryport="27015"
+queryport="7779" # port +2?
 rconport="27020"
 # Default Map: TheIsland, Ragnarok, CrystalIsles, Aberration_P, ScorchedEarth_P, TheCenter, Extinction, Valguero_P, Genesis, Gen2
 defaultmap="TheIsland"
 altsavedirectoryname="${defaultmap}"
-maxplayers="70"
+maxplayers="8"
+servername="LinuxGSM"
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-startparameters="ProjectWar ProjectWar_Start ?Listen?MaxPlayers=8 -server -game -QueueThreshold=8 -ServerName=\"YOUR SERVER NAME\" -ServerAdminAccounts=STEAM64ID;STEAM64ID;STEAM64ID -log log=log.log -locallogtimes -EnableParallelCharacterMovementTickFunction -EnableParallelCharacterTickFunction -UseDynamicPhysicsScene -OutIPAddress=YOUR_PUBLIC_IP -ServerID=ANY_IDEA -port=PORT-BeaconPort=PORT+1 -QueryPort=PORT+2 -Game.PhysicsVehicle=false -ansimalloc -Game.MaxFrameRate=35 -ShutDownServicePort=PORT+3"
+startparameters="ProjectWar ProjectWar_Start ?Listen?MaxPlayers=${maxplayers} -server -game -QueueThreshold=${maxplayers} -ConfigServerName=\"${servername}\" -ServerName=\"${servername}\" -log log=log.log -locallogtimes -ServerAdminAccounts=STEAM64ID;STEAM64ID;STEAM64ID -OutIPAddress=${publicip} -ServerID=ANY_IDEA -Port=${port} -BeaconPort=${beaconport} -QueryPort=${queryport} -Game.PhysicsVehicle=false -ansimalloc -Game.MaxFrameRate=35 -ShutDownServicePort=PORT+3 -EnableParallelCharacterMovementTickFunction -EnableParallelCharacterTickFunction -UseDynamicPhysicsScene"
 
 #### LinuxGSM Settings ####