diff --git a/lgsm/data/serverlist.csv b/lgsm/data/serverlist.csv
index 4c80f538a7..c075684b7b 100644
--- a/lgsm/data/serverlist.csv
+++ b/lgsm/data/serverlist.csv
@@ -1,127 +1,127 @@
-ac,acserver,Assetto Corsa
-ahl,ahlserver,Action Half-Life
-ahl2,ahl2server,Action: Source
-ark,arkserver,ARK: Survival Evolved
-arma3,arma3server,ARMA 3
-armar,armarserver,Arma Reforger
-av,avserver,Avorion
-bb,bbserver,BrainBread
-bb2,bb2server,BrainBread 2
-bd,bdserver,Base Defense
-bf1942,bf1942server,Battlefield 1942
-bfv,bfvserver,Battlefield: Vietnam
-bmdm,bmdmserver,Black Mesa: Deathmatch
-bo,boserver,Ballistic Overkill
-bs,bsserver,Blade Symphony
-bt,btserver,Barotrauma
-bt1944,bt1944server,Battalion 1944
-cc,ccserver,Codename CURE
-cd,cdserver,Crafting Dead
-cmw,cmwserver,Chivalry: Medieval Warfare
-cod,codserver,Call of Duty
-cod2,cod2server,Call of Duty 2
-cod4,cod4server,Call of Duty 4
-coduo,coduoserver,Call of Duty: United Offensive
-codwaw,codwawserver,Call of Duty: World at War
-col,colserver,Colony Survival
-cs,csserver,Counter-Strike 1.6
-cscz,csczserver,Counter-Strike: Condition Zero
-csgo,csgoserver,Counter-Strike: Global Offensive
-css,cssserver,Counter-Strike: Source
-dab,dabserver,Double Action: Boogaloo
-dayz,dayzserver,DayZ
-dmc,dmcserver,Deathmatch Classic
-dod,dodserver,Day of Defeat
-dodr,dodrserver,Day of Dragons
-dods,dodsserver,Day of Defeat: Source
-doi,doiserver,Day of Infamy
-dst,dstserver,Don't Starve Together
-dys,dysserver,Dystopia
-eco,ecoserver,Eco
-em,emserver,Empires Mod
-etl,etlserver,ET: Legacy
-fctr,fctrserver,Factorio
-fof,fofserver,Fistful of Frags
-gmod,gmodserver,Garrys Mod
-hl2dm,hl2dmserver,Half-Life 2: Deathmatch
-hldm,hldmserver,Half-Life: Deathmatch
-hldms,hldmsserver,Half-Life Deathmatch: Source
-hw,hwserver,Hurtworld
-ins,insserver,Insurgency
-inss,inssserver,Insurgency: Sandstorm
-ios,iosserver,IOSoccer
-jc2,jc2server,Just Cause 2
-jc3,jc3server,Just Cause 3
-jk2,jk2server,Jedi Knight II: Jedi Outcast
-kf,kfserver,Killing Floor
-kf2,kf2server,Killing Floor 2
-lo,loserver,Last Oasis
-l4d,l4dserver,Left 4 Dead
-l4d2,l4d2server,Left 4 Dead 2
-mc,mcserver,Minecraft
-mcb,mcbserver,Minecraft Bedrock
-mh,mhserver,MORDHAU
-mohaa,mohaaserver,Medal of Honor: Allied Assault
-mom,momserver,Memories of Mars
-mta,mtaserver,Multi Theft Auto
-mumble,mumbleserver,Mumble
-nd,ndserver,Nuclear Dawn
-nmrih,nmrihserver,No More Room in Hell
-ns,nsserver,Natural Selection
-ns2,ns2server,Natural Selection 2
-ns2c,ns2cserver,NS2: Combat
-onset,onsetserver,Onset
-opfor,opforserver,Opposing Force
-pc,pcserver,Project Cars
-pc2,pc2server,Project Cars 2
-pmc,pmcserver,PaperMC
-pstbs,pstbsserver,Post Scriptum: The Bloody Seventh
-pvkii,pvkiiserver,Pirates Vikings & Knights II
-pvr,pvrserver,Pavlov VR
-pz,pzserver,Project Zomboid
-q2,q2server,Quake 2
-q3,q3server,Quake 3: Arena
-ql,qlserver,Quake Live
-qw,qwserver,Quake World
-ricochet,ricochetserver,Ricochet
-ro,roserver,Red Orchestra: Ostfront 41-45
-rtcw,rtcwserver,Return to Castle Wolfenstein
-rust,rustserver,Rust
-rw,rwserver,Rising World
-samp,sampserver,San Andreas Multiplayer
-sb,sbserver,Starbound
-sbots,sbotsserver,StickyBots
-scpsl,scpslserver,SCP: Secret Laboratory
-scpslsm,scpslsmserver,SCP: Secret Laboratory ServerMod
-sdtd,sdtdserver,7 Days to Die
-sfc,sfcserver,SourceForts Classic
-sf,sfserver,Satisfactory
-sof2,sof2server,Soldier Of Fortune 2: Gold Edition
-sol,solserver,Soldat
-squad,squadserver,Squad
-st,stserver,Stationeers
-stn,stnserver,Survive the Nights
-sven,svenserver,Sven Co-op
-terraria,terrariaserver,Terraria
-tf2,tf2server,Team Fortress 2
-tfc,tfcserver,Team Fortress Classic
-ti,tiserver,The Isle
-ts,tsserver,The Specialists
-ts3,ts3server,Teamspeak 3
-tu,tuserver,Tower Unite
-tw,twserver,Teeworlds
-unt,untserver,Unturned
-ut,utserver,Unreal Tournament
-ut2k4,ut2k4server,Unreal Tournament 2004
-ut3,ut3server,Unreal Tournament 3
-ut99,ut99server,Unreal Tournament 99
-vh,vhserver,Valheim
-vints,vintsserver,Vintage Story
-vpmc,vpmcserver,Velocity Proxy MC
-vs,vsserver,Vampire Slayer
-wet,wetserver,Wolfenstein: Enemy Territory
-wf,wfserver,Warfork
-wmc,wmcserver,WaterfallMC
-wurm,wurmserver,Wurm Unlimited
-zmr,zmrserver,Zombie Master: Reborn
-zps,zpsserver,Zombie Panic! Source
+ac,acserver,Assetto Corsa,ubuntu-22.04
+ahl,ahlserver,Action Half-Life,ubuntu-22.04
+ahl2,ahl2server,Action: Source,ubuntu-22.04
+ark,arkserver,ARK: Survival Evolved,ubuntu-22.04
+arma3,arma3server,ARMA 3,ubuntu-22.04
+armar,armarserver,Arma Reforger,ubuntu-20.04
+av,avserver,Avorion,ubuntu-22.04
+bb,bbserver,BrainBread,ubuntu-22.04
+bb2,bb2server,BrainBread 2,ubuntu-22.04
+bd,bdserver,Base Defense,ubuntu-22.04
+bf1942,bf1942server,Battlefield 1942,ubuntu-22.04
+bfv,bfvserver,Battlefield: Vietnam,ubuntu-22.04
+bmdm,bmdmserver,Black Mesa: Deathmatch,ubuntu-22.04
+bo,boserver,Ballistic Overkill,ubuntu-22.04
+bs,bsserver,Blade Symphony,ubuntu-22.04
+bt,btserver,Barotrauma,ubuntu-22.04
+bt1944,bt1944server,Battalion 1944,ubuntu-22.04
+cc,ccserver,Codename CURE,ubuntu-22.04
+cd,cdserver,Crafting Dead,ubuntu-22.04
+cmw,cmwserver,Chivalry: Medieval Warfare,ubuntu-22.04
+cod,codserver,Call of Duty,ubuntu-22.04
+cod2,cod2server,Call of Duty 2,ubuntu-22.04
+cod4,cod4server,Call of Duty 4,ubuntu-22.04
+coduo,coduoserver,Call of Duty: United Offensive,ubuntu-22.04
+codwaw,codwawserver,Call of Duty: World at War,ubuntu-22.04
+col,colserver,Colony Survival,ubuntu-22.04
+cs,csserver,Counter-Strike 1.6,ubuntu-22.04
+cscz,csczserver,Counter-Strike: Condition Zero,ubuntu-22.04
+csgo,csgoserver,Counter-Strike: Global Offensive,ubuntu-22.04
+css,cssserver,Counter-Strike: Source,ubuntu-22.04
+dab,dabserver,Double Action: Boogaloo,ubuntu-22.04
+dayz,dayzserver,DayZ,ubuntu-22.04
+dmc,dmcserver,Deathmatch Classic,ubuntu-22.04
+dod,dodserver,Day of Defeat,ubuntu-22.04
+dodr,dodrserver,Day of Dragons,ubuntu-22.04
+dods,dodsserver,Day of Defeat: Source,ubuntu-22.04
+doi,doiserver,Day of Infamy,ubuntu-22.04
+dst,dstserver,Don't Starve Together,ubuntu-22.04
+dys,dysserver,Dystopia,ubuntu-22.04
+eco,ecoserver,Eco,ubuntu-22.04
+em,emserver,Empires Mod,ubuntu-22.04
+etl,etlserver,ET: Legacy,ubuntu-22.04
+fctr,fctrserver,Factorio,ubuntu-22.04
+fof,fofserver,Fistful of Frags,ubuntu-22.04
+gmod,gmodserver,Garrys Mod,ubuntu-22.04
+hl2dm,hl2dmserver,Half-Life 2: Deathmatch,ubuntu-22.04
+hldm,hldmserver,Half-Life: Deathmatch,ubuntu-22.04
+hldms,hldmsserver,Half-Life Deathmatch: Source,ubuntu-22.04
+hw,hwserver,Hurtworld,ubuntu-22.04
+ins,insserver,Insurgency,ubuntu-22.04
+inss,inssserver,Insurgency: Sandstorm,ubuntu-22.04
+ios,iosserver,IOSoccer,ubuntu-22.04
+jc2,jc2server,Just Cause 2,ubuntu-22.04
+jc3,jc3server,Just Cause 3,ubuntu-22.04
+jk2,jk2server,Jedi Knight II: Jedi Outcast,ubuntu-22.04
+kf,kfserver,Killing Floor,ubuntu-22.04
+kf2,kf2server,Killing Floor 2,ubuntu-22.04
+l4d,l4dserver,Left 4 Dead,ubuntu-22.04
+l4d2,l4d2server,Left 4 Dead 2,ubuntu-22.04
+lo,loserver,Last Oasis,ubuntu-22.04
+mc,mcserver,Minecraft,ubuntu-22.04
+mcb,mcbserver,Minecraft Bedrock,ubuntu-22.04
+mh,mhserver,MORDHAU,ubuntu-22.04
+mohaa,mohaaserver,Medal of Honor: Allied Assault,ubuntu-22.04
+mom,momserver,Memories of Mars,ubuntu-22.04
+mta,mtaserver,Multi Theft Auto,ubuntu-22.04
+mumble,mumbleserver,Mumble,ubuntu-22.04
+nd,ndserver,Nuclear Dawn,ubuntu-22.04
+nmrih,nmrihserver,No More Room in Hell,ubuntu-22.04
+ns,nsserver,Natural Selection,ubuntu-22.04
+ns2,ns2server,Natural Selection 2,ubuntu-22.04
+ns2c,ns2cserver,NS2: Combat,ubuntu-22.04
+onset,onsetserver,Onset,ubuntu-20.04
+opfor,opforserver,Opposing Force,ubuntu-22.04
+pc,pcserver,Project Cars,ubuntu-22.04
+pc2,pc2server,Project Cars 2,ubuntu-22.04
+pmc,pmcserver,PaperMC,ubuntu-22.04
+pstbs,pstbsserver,Post Scriptum: The Bloody Seventh,ubuntu-22.04
+pvkii,pvkiiserver,Pirates Vikings & Knights II,ubuntu-22.04
+pvr,pvrserver,Pavlov VR,ubuntu-22.04
+pz,pzserver,Project Zomboid,ubuntu-22.04
+q2,q2server,Quake 2,ubuntu-22.04
+q3,q3server,Quake 3: Arena,ubuntu-22.04
+ql,qlserver,Quake Live,ubuntu-22.04
+qw,qwserver,Quake World,ubuntu-22.04
+ricochet,ricochetserver,Ricochet,ubuntu-22.04
+ro,roserver,Red Orchestra: Ostfront 41-45,ubuntu-22.04
+rtcw,rtcwserver,Return to Castle Wolfenstein,ubuntu-22.04
+rust,rustserver,Rust,ubuntu-22.04
+rw,rwserver,Rising World,ubuntu-22.04
+samp,sampserver,San Andreas Multiplayer,ubuntu-22.04
+sb,sbserver,Starbound,ubuntu-22.04
+sbots,sbotsserver,StickyBots,ubuntu-22.04
+scpsl,scpslserver,SCP: Secret Laboratory,ubuntu-22.04
+scpslsm,scpslsmserver,SCP: Secret Laboratory ServerMod,ubuntu-22.04
+sdtd,sdtdserver,7 Days to Die,ubuntu-22.04
+sf,sfserver,Satisfactory,ubuntu-22.04
+sfc,sfcserver,SourceForts Classic,ubuntu-22.04
+sof2,sof2server,Soldier Of Fortune 2: Gold Edition,ubuntu-22.04
+sol,solserver,Soldat,ubuntu-22.04
+squad,squadserver,Squad,ubuntu-22.04
+st,stserver,Stationeers,ubuntu-22.04
+stn,stnserver,Survive the Nights,ubuntu-22.04
+sven,svenserver,Sven Co-op,ubuntu-20.04
+terraria,terrariaserver,Terraria,ubuntu-22.04
+tf2,tf2server,Team Fortress 2,ubuntu-22.04
+tfc,tfcserver,Team Fortress Classic,ubuntu-22.04
+ti,tiserver,The Isle,ubuntu-22.04
+ts,tsserver,The Specialists,ubuntu-22.04
+ts3,ts3server,Teamspeak 3,ubuntu-22.04
+tu,tuserver,Tower Unite,ubuntu-22.04
+tw,twserver,Teeworlds,ubuntu-22.04
+unt,untserver,Unturned,ubuntu-22.04
+ut,utserver,Unreal Tournament,ubuntu-22.04
+ut2k4,ut2k4server,Unreal Tournament 2004,ubuntu-22.04
+ut3,ut3server,Unreal Tournament 3,ubuntu-22.04
+ut99,ut99server,Unreal Tournament 99,ubuntu-22.04
+vh,vhserver,Valheim,ubuntu-22.04
+vints,vintsserver,Vintage Story,ubuntu-22.04
+vpmc,vpmcserver,Velocity Proxy MC,ubuntu-22.04
+vs,vsserver,Vampire Slayer,ubuntu-22.04
+wet,wetserver,Wolfenstein: Enemy Territory,ubuntu-22.04
+wf,wfserver,Warfork,ubuntu-22.04
+wmc,wmcserver,WaterfallMC,ubuntu-22.04
+wurm,wurmserver,Wurm Unlimited,ubuntu-22.04
+zmr,zmrserver,Zombie Master: Reborn,ubuntu-22.04
+zps,zpsserver,Zombie Panic! Source,ubuntu-22.04
diff --git a/lgsm/data/ubuntu-20.04.csv b/lgsm/data/ubuntu-20.04.csv
index 49f64348d5..db5cfd03b9 100644
--- a/lgsm/data/ubuntu-20.04.csv
+++ b/lgsm/data/ubuntu-20.04.csv
@@ -5,7 +5,7 @@ ahl
 ahl2
 ark
 arma3
-armar,libcurl4,libssl1.1
+armar,libcurl4
 av
 bb
 bb2,libcurl4-gnutls-dev:i386
@@ -15,7 +15,7 @@ bfv,libncurses5:i386,libstdc++5:i386
 bmdm,libncurses5:i386
 bo
 bs
-bt,libicu-dev
+bt,libicu-dev,dos2unix
 bt1944
 cc
 cd
@@ -57,9 +57,9 @@ jc3
 jk2
 kf
 kf2
-lo
 l4d
 l4d2
+lo
 mc,openjdk-17-jre
 mcb
 mh
@@ -72,7 +72,7 @@ nmrih,libtinfo5:i386
 ns
 ns2,speex,libtbb2
 ns2c,speex:i386,libtbb2
-onset,libmariadbclient-dev
+onset,libmariadb-dev
 opfor
 pc
 pmc,openjdk-17-jre
@@ -95,8 +95,8 @@ sbots
 scpsl,mono-complete
 scpslsm,mono-complete
 sdtd,telnet,expect
-sfc,libtinfo5:i386
 sf
+sfc,libtinfo5:i386
 sof2
 sol
 squad
@@ -117,9 +117,9 @@ ut2k4
 ut3
 ut99
 vh,libc6-dev
-vs
 vints,mono-complete
 vpmc,openjdk-11-jre
+vs
 wet
 wf
 wmc,openjdk-17-jre
diff --git a/lgsm/data/ubuntu-22.04.csv b/lgsm/data/ubuntu-22.04.csv
index dd567bf7be..7a28e4b041 100644
--- a/lgsm/data/ubuntu-22.04.csv
+++ b/lgsm/data/ubuntu-22.04.csv
@@ -5,7 +5,7 @@ ahl
 ahl2
 ark
 arma3
-armar,libcurl4,libssl1.1
+armar,libcurl4
 av
 bb
 bb2,libcurl4-gnutls-dev:i386
@@ -15,7 +15,7 @@ bfv,libncurses5:i386,libstdc++5:i386
 bmdm,libncurses5:i386
 bo
 bs
-bt,libicu-dev
+bt,libicu-dev,dos2unix
 bt1944
 cc
 cmw
@@ -55,9 +55,9 @@ jc3
 jk2
 kf
 kf2
-lo
 l4d
 l4d2
+lo
 mc,openjdk-17-jre
 mcb
 mh
@@ -70,7 +70,7 @@ nmrih,libtinfo5:i386
 ns
 ns2,speex,libtbb2
 ns2c,speex:i386,libtbb2
-onset,libmariadbclient-dev
+onset,libmariadb-dev
 opfor
 pc
 pmc,openjdk-17-jre
@@ -93,15 +93,15 @@ sbots
 scpsl,mono-complete
 scpslsm,mono-complete
 sdtd,telnet,expect
-sfc,libtinfo5:i386
 sf
+sfc,libtinfo5:i386
 sof2
 sol
 squad
 st
 stn
 sven,libssl1.1:i386,zlib1g:i386
-terraria,libsdl
+terraria
 tf2,libcurl4-gnutls-dev:i386
 tfc
 ti
@@ -115,9 +115,9 @@ ut2k4
 ut3
 ut99
 vh,libc6-dev
-vs
 vints,mono-complete
 vpmc,openjdk-11-jre
+vs
 wet
 wf
 wmc,openjdk-17-jre