diff --git a/setup/bootstrap.sh b/setup/bootstrap.sh
index 1c0b9ea6..9197ed3b 100644
--- a/setup/bootstrap.sh
+++ b/setup/bootstrap.sh
@@ -9,7 +9,7 @@
 if [ -z "$TAG" ]; then
 	# Make s
 	OS=`lsb_release -d | sed 's/.*:\s*//'`
-	if [ "$OS" == "Debian GNU/Linux 10 (buster)" -o "$OS" == "Ubuntu 20.04 LTS" ]; then
+	if [ "$OS" == "Debian GNU/Linux 10 (buster)" -o "$(echo $OS | grep -o 'Ubuntu 20.04')" == "Ubuntu 20.04" ]; then
 		TAG=v0.46.POWER.4
 	else
 		echo "This script must be run on a system running Debian 10 OR Ubuntu 20.04 LTS."
diff --git a/setup/preflight.sh b/setup/preflight.sh
index 51952693..c8573160 100644
--- a/setup/preflight.sh
+++ b/setup/preflight.sh
@@ -7,9 +7,9 @@ if [[ $EUID -ne 0 ]]; then
 	exit 1
 fi
 
-# Check that we are running on Debian GNU/Linux
-OS=`lsb_release -d | sed 's/.*:\s*//' `
-if [ "$OS" != "Debian GNU/Linux 10 (buster)" -a "$OS" != "Ubuntu 20.04 LTS" ]; then
+# Check that we are running on Debian GNU/Linux, or Ubuntu 20.04
+OS=`lsb_release -d | sed 's/.*:\s*//'`
+if [ "$OS" != "Debian GNU/Linux 10 (buster)" -a "$(echo $OS | grep -o 'Ubuntu 20.04')" != "Ubuntu 20.04" ]; then
 	echo "Mail-in-a-Box only supports being installed on Debian 10 or Ubuntu 20.04 LTS, sorry. You are running:"
 	echo
 	lsb_release -d | sed 's/.*:\s*//'