diff --git a/lgsm/data/serverlist.csv b/lgsm/data/serverlist.csv
index 0f350b55d..19ef8426b 100644
--- a/lgsm/data/serverlist.csv
+++ b/lgsm/data/serverlist.csv
@@ -10,8 +10,8 @@ av,avserver,Avorion,ubuntu-24.04
 bb,bbserver,BrainBread,ubuntu-24.04
 bb2,bb2server,BrainBread 2,ubuntu-24.04
 bd,bdserver,Base Defense,ubuntu-24.04
-bf1942,bf1942server,Battlefield 1942,ubuntu-24.04
-bfv,bfvserver,Battlefield: Vietnam,ubuntu-24.04
+bf1942,bf1942server,Battlefield 1942,ubuntu-22.04
+bfv,bfvserver,Battlefield: Vietnam,ubuntu-22.04
 bmdm,bmdmserver,Black Mesa: Deathmatch,ubuntu-24.04
 bo,boserver,Ballistic Overkill,ubuntu-24.04
 bs,bsserver,Blade Symphony,ubuntu-24.04
diff --git a/lgsm/data/ubuntu-24.04.csv b/lgsm/data/ubuntu-24.04.csv
index c0135abd7..7672eca22 100644
--- a/lgsm/data/ubuntu-24.04.csv
+++ b/lgsm/data/ubuntu-24.04.csv
@@ -31,7 +31,7 @@ cs
 cs2
 cscz
 csgo
-css,libtinfo5:i386
+css
 ct
 dab
 dayz
@@ -48,7 +48,7 @@ etl
 ets2
 fctr
 fof
-gmod,libtinfo5:i386
+gmod
 hcu
 hl2dm
 hldm
@@ -72,7 +72,7 @@ mohaa,libstdc++5:i386
 mta,libncursesw5,libxml2-utils
 nd
 nec
-nmrih,libtinfo5:i386
+nmrih
 ns
 ns2,speex,libtbb2
 ns2c,speex:i386,libtbb2
@@ -104,7 +104,7 @@ scpsl,mono-complete
 scpslsm,mono-complete
 sdtd,telnet,expect,libxml2-utils
 sf
-sfc,libtinfo5:i386
+sfc
 sm,telnet,expect
 sof2
 sol
@@ -135,5 +135,5 @@ wf
 wmc,openjdk-21-jre
 wurm,xvfb
 xnt
-zmr,libtinfo5:i386
-zps,libtinfo5:i386
+zmr
+zps
diff --git a/lgsm/modules/check_deps.sh b/lgsm/modules/check_deps.sh
index dcc9c890c..6415e3d08 100644
--- a/lgsm/modules/check_deps.sh
+++ b/lgsm/modules/check_deps.sh
@@ -348,6 +348,8 @@ if [ "${commandname}" == "INSTALL" ]; then
 	fi
 fi
 
+info_distro.sh
+
 # Will warn user if their distro is no longer supported by the vendor.
 if [ -n "${distrosupport}" ]; then
 	if [ "${distrosupport}" == "unsupported" ]; then
@@ -356,7 +358,13 @@ if [ -n "${distrosupport}" ]; then
 	fi
 fi
 
-info_distro.sh
+if { [ "${distroid}" == "ubuntu" ] && dpkg --compare-versions "${distroversion}" "gt" "24.04"; } || { [ "${distroidlike}" == "debian" ] && dpkg --compare-versions "${distroversion}" "gt" "12"; }; then
+    if [ "${shortname}" == "bf1942" ] || [ "${shortname}" == "bfv" ]; then
+        fn_print_warning_nl "${gamename} is not supported on ${distroname}."
+        fn_script_log_warn "${gamename} is not supported on ${distroname}."
+        core_exit.sh
+    fi
+fi
 
 if [ ! -f "${tmpdir}/dependency-no-check.tmp" ] && [ ! -f "${datadir}/${distroid}-${distroversioncsv}.csv" ]; then
 	# Check that the distro dependency csv file exists.