diff --git a/scripts/local_facts.fact b/scripts/local_facts.fact
index a24a1a2da..e9f1fdb19 100755
--- a/scripts/local_facts.fact
+++ b/scripts/local_facts.fact
@@ -72,8 +72,11 @@ OS_VER="$OS-$VERSION_ID"
     #"ubuntu-2104"  | \
     #"ubuntu-2110"  | \
     #"ubuntu-2210"  | \
+    #"ubuntu-2204"  | \
     #"ubuntu-2304"  | \
+    #"ubuntu-2310"  | \
     #"linuxmint-20" | \
+    #"linuxmint-21" | \
     #"raspbian-8"   | \
     #"raspbian-9"   | \
     #"raspbian-10"  | \
@@ -85,11 +88,9 @@ OS_VER="$OS-$VERSION_ID"
 case $OS_VER in
     "debian-12"    | \
     "debian-13"    | \
-    "ubuntu-2204"  | \
-    "ubuntu-2310"  | \
     "ubuntu-2404"  | \
     "ubuntu-2410"  | \
-    "linuxmint-21" | \
+    "ubuntu-2504"  | \
     "linuxmint-22" | \
     "raspbian-12"  | \
     "raspbian-13")
diff --git a/vars/default_vars.yml b/vars/default_vars.yml
index 68a520970..caa6fd774 100644
--- a/vars/default_vars.yml
+++ b/vars/default_vars.yml
@@ -764,6 +764,7 @@ pbx_http_port: 83
 is_debuntu: False    # Covers all 4: Ubuntu, Linux Mint, Debian, Raspberry Pi OS (Raspbian)
 
 is_ubuntu: False    # Covers: Ubuntu, Linux Mint
+is_ubuntu_2504: False
 is_ubuntu_2410: False
 is_ubuntu_2404: False
 is_ubuntu_2310: False
@@ -780,7 +781,7 @@ is_ubuntu_2204: False
 
 is_linuxmint: False    # Subset of is_ubuntu
 is_linuxmint_22: False
-is_linuxmint_21: False
+#is_linuxmint_21: False
 #is_linuxmint_20: False
 
 is_debian: False    # Covers both: Debian, Raspberry Pi OS (Raspbian)
diff --git a/vars/linuxmint-21.yml b/vars/linuxmint-21.yml.unused
similarity index 100%
rename from vars/linuxmint-21.yml
rename to vars/linuxmint-21.yml.unused
diff --git a/vars/ubuntu-2310.yml b/vars/ubuntu-2310.yml.unused
similarity index 100%
rename from vars/ubuntu-2310.yml
rename to vars/ubuntu-2310.yml.unused
diff --git a/vars/ubuntu-2504.yml b/vars/ubuntu-2504.yml
new file mode 100644
index 000000000..a548ba9a1
--- /dev/null
+++ b/vars/ubuntu-2504.yml
@@ -0,0 +1,5 @@
+# Every is_<OS_VER> var is initially set to 'False' at the bottom of
+# /opt/iiab/iiab/vars/default_vars.yml -- these 'True' lines override that:
+is_debuntu: True
+is_ubuntu: True    # Opposite of is_debian for now
+is_ubuntu_2504: True