diff --git a/salt/common/init.sls b/salt/common/init.sls
index 0fa7794af..18c70747a 100644
--- a/salt/common/init.sls
+++ b/salt/common/init.sls
@@ -107,10 +107,17 @@ commonpkgs:
 heldpackages:
   pkg.installed:
     - pkgs:
+    {% if grains['codename'] == 'bionic' %}
       - containerd.io: 1.4.4-1
       - docker-ce: 5:20.10.5~3-0~ubuntu-bionic
       - docker-ce-cli: 5:20.10.5~3-0~ubuntu-bionic
       - docker-ce-rootless-extras: 5:20.10.5~3-0~ubuntu-bionic
+    {% elif grains['codename'] == 'focal' %}
+      - containerd.io: 1.4.9-1
+      - docker-ce: 5:20.10.8~3-0~ubuntu-focal
+      - docker-ce-cli: 5:20.10.5~3-0~ubuntu-focal
+      - docker-ce-rootless-extras: 5:20.10.5~3-0~ubuntu-focal
+    {% endif %}
     - hold: True
     - update_holds: True
 
diff --git a/salt/mysql/init.sls b/salt/mysql/init.sls
index be44b652c..04cbacc99 100644
--- a/salt/mysql/init.sls
+++ b/salt/mysql/init.sls
@@ -22,7 +22,11 @@ mysqlpkgs:
     - skip_suggestions: False
     - pkgs:
       {% if grains['os'] != 'CentOS' %}
-      - python-mysqldb
+        {% if grains['codename'] == 'bionic' %}
+      - python3-mysqldb
+        {% elif grains['codename'] == 'focal' %}
+      - python3-mysqldb
+        {% endif %}
       {% else %}
       - MySQL-python
       {% endif %}
diff --git a/salt/salt/init.sls b/salt/salt/init.sls
index 18be055db..d01fe1958 100644
--- a/salt/salt/init.sls
+++ b/salt/salt/init.sls
@@ -3,7 +3,11 @@ saltpymodules:
   pkg.installed:
     - pkgs:
       - python-docker
+      {% if grains['codename'] == 'bionic' %}
       - python-m2crypto
+      {% elif grains['codename'] == 'focal' %}
+      - python3-m2crypto
+      {% endif %}
 {% endif %}
 
 salt_bootstrap:
diff --git a/salt/salt/scripts/bootstrap-salt.sh b/salt/salt/scripts/bootstrap-salt.sh
index 70241a041..3e54afce0 100644
--- a/salt/salt/scripts/bootstrap-salt.sh
+++ b/salt/salt/scripts/bootstrap-salt.sh
@@ -3082,7 +3082,11 @@ install_ubuntu_git_deps() {
                 __PACKAGES="${__PACKAGES} python3-setuptools"
             else
                 # There is no m2crypto package for Py3 at this time - only install for Py2
+                if [ $DISTRO_CODENAME == "focal" ]; then
+                __PACKAGES="${__PACKAGES} python3-m2crypto"
+                else
                 __PACKAGES="${__PACKAGES} python-m2crypto"
+                fi
             fi
 
             __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-crypto python${PY_PKG_VER}-jinja2"
diff --git a/salt/ssl/init.sls b/salt/ssl/init.sls
index f6cfaf4f4..54c48ab34 100644
--- a/salt/ssl/init.sls
+++ b/salt/ssl/init.sls
@@ -42,7 +42,11 @@ m2cryptopkgs:
   pkg.installed:
     - skip_suggestions: False
     - pkgs:
+    {% if grains['codename'] == 'bionic' %}
       - python-m2crypto
+    {% elif grains['codename'] == 'focal' %}
+      - python3-m2crypto
+    {% endif %}
 {% endif %}
 
 removefbcertdir:
diff --git a/setup/so-functions b/setup/so-functions
index 06ec7238a..f2cdbc237 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1104,8 +1104,8 @@ detect_os() {
 		OS=ubuntu
 		if grep -q "UBUNTU_CODENAME=bionic" /etc/os-release; then
 			OSVER=bionic
-		elif grep -q "UBUNTU_CODENAME=xenial" /etc/os-release; then
-			OSVER=xenial
+		elif grep -q "UBUNTU_CODENAME=focal" /etc/os-release; then
+			OSVER=focal
 		else
 			echo "We do not support your current version of Ubuntu."
 			exit 1
@@ -2159,9 +2159,12 @@ saltify() {
 	else
 		DEBIAN_FRONTEND=noninteractive retry 50 10 "apt-get -y -o Dpkg::Options::=\"--force-confdef\" -o Dpkg::Options::=\"--force-confold\" upgrade" >> "$setup_log" 2>&1 || exit 1
 
-		if [ $OSVER != "xenial" ]; then
+		if [ $OSVER == "bionic" ]; then
 			# Switch to Python 3 as default if this is not xenial
 			update-alternatives --install /usr/bin/python python /usr/bin/python3.6 10 >> "$setup_log" 2>&1
+		elif [ $OSVER == "focal" ]; then
+			# Switch to Python 3 as default if this is not xenial
+			update-alternatives --install /usr/bin/python python /usr/bin/python3.8 10 >> "$setup_log" 2>&1
 		fi
 		
 		local pkg_arr=(