diff --git a/db/Provision/Service/db/mysql.php b/db/Provision/Service/db/mysql.php
index 582adfcd..0ed6c456 100644
--- a/db/Provision/Service/db/mysql.php
+++ b/db/Provision/Service/db/mysql.php
@@ -25,7 +25,7 @@ class Provision_Service_db_mysql extends Provision_Service_db_pdo {
   }
 
   function can_create_database() {
-    $test = drush_get_option('aegir_db_prefix', 'site_') . 'tmp_test';
+    $test = drush_get_option('aegir_db_prefix', 'site_') . 'test';
     $this->create_database($test);
 
     if ($this->database_exists($test)) {
@@ -44,7 +44,7 @@ class Provision_Service_db_mysql extends Provision_Service_db_pdo {
    *   TRUE if the check was successful.
    */
   function can_grant_privileges() {
-    $dbname = drush_get_option('aegir_db_prefix', 'site_') . 'tmp_test';
+    $dbname = drush_get_option('aegir_db_prefix', 'site_') . 'test';
     $this->create_database($dbname);
 
     $user     = $dbname . '_user';
@@ -67,27 +67,17 @@ class Provision_Service_db_mysql extends Provision_Service_db_pdo {
     return $this->grant_privileges($name, $username, $password, $host);
   }
 
-  function create_user($username, $host) {
-    $statement = "CREATE USER IF NOT EXISTS `%s`@`%s`";
-    return $this->query($statement, $username, $host);
-  }
-
-  function alter_user($username, $host, $password) {
-    $statement = "ALTER USER `%s`@`%s` IDENTIFIED BY '%s'";
+  function create_user($username, $host, $password) {
+    $statement = "CREATE USER IF NOT EXISTS `%s`@`%s` IDENTIFIED BY '%s'";
     return $this->query($statement, $username, $host, $password);
   }
 
   function grant_privileges($name, $username, $password, $host) {
-    $user_created = $this->create_user($username, $host);
-    $user_altered = $this->alter_user($username, $host, $password);
+    $user_created = $this->create_user($username, $host, $password);
     if (!$user_created) {
-      drush_log(dt("Failed to create db_user @name", array('@name' => $username)), 'error');
+      drush_log('Failed to create database user.', 'error');
       return $user_created;
     }
-    if (!$user_altered) {
-      drush_log(dt("Failed to alter db_user @name", array('@name' => $username)), 'error');
-      return $user_altered;
-    }
 
     $statement = "GRANT ALL PRIVILEGES ON `%s`.* TO `%s`@`%s`";
     return $this->query($statement, $name, $username, $host);
diff --git a/debian/aegir3-hostmaster.postinst b/debian/aegir3-hostmaster.postinst
index e27891b7..6238baf1 100644
--- a/debian/aegir3-hostmaster.postinst
+++ b/debian/aegir3-hostmaster.postinst
@@ -163,9 +163,7 @@ case "$1" in
               # Random password, will be stored in /var/aegir/.drush/server_localhost.alias.drushrc.php
               AEGIR_DB_PASS=$(openssl rand -base64 12)
 
-              /usr/bin/mysql -e "CREATE USER IF NOT EXISTS '$AEGIR_DB_USER'@'$AEGIR_DB_HOST'"
-              /usr/bin/mysql -e "ALTER USER '$AEGIR_DB_USER'@'$AEGIR_DB_HOST' IDENTIFIED BY '$AEGIR_DB_PASS'"
-              /usr/bin/mysql -e "GRANT ALL ON *.* TO '$AEGIR_DB_USER'@'$AEGIR_DB_HOST' WITH GRANT OPTION"
+              /usr/bin/mysql -e "GRANT ALL ON *.* TO '$AEGIR_DB_USER'@'$AEGIR_DB_HOST' IDENTIFIED BY '$AEGIR_DB_PASS' WITH GRANT OPTION"
             fi
             
             if [ -d $AEGIRHOME/.drush/provision ]; then
diff --git a/scripts/ci-aegir-dev-install-apt-ubuntu-focal.sh b/scripts/ci-aegir-dev-install-apt-ubuntu-focal.sh
index a4815e13..332107a8 100755
--- a/scripts/ci-aegir-dev-install-apt-ubuntu-focal.sh
+++ b/scripts/ci-aegir-dev-install-apt-ubuntu-focal.sh
@@ -2,29 +2,33 @@
 # Install Aegir debian packages located in the 'build/' directory.
 # These are provided by the GitLab CI build stage.
 #
-# This script is tuned for Ubuntu 20.04. (focal)
+# This script is tuned for Ubuntu 20.04.
 #
 echo "[CI] Updating APT"
-sudo apt update
+sudo apt-get update
 
 echo "[CI] Setting debconf settings"
-sudo debconf-set-selections <<EOF
-debconf debconf/frontend select Noninteractive
+echo "debconf debconf/frontend select Noninteractive" | debconf-set-selections
+#echo "debconf debconf/priority select critical" | debconf-set-selections
+
+
+debconf-set-selections <<EOF
 aegir3-hostmaster aegir/db_password string PASSWORD
-aegir3-hostmaster aegir/db_password seen true
-aegir3-hostmaster aegir/db_user string aegir_root
+aegir3-hostmaster aegir/db_password seen  true
+aegir3-hostmaster aegir/db_user string root
 aegir3-hostmaster aegir/db_host string localhost
-aegir3-hostmaster aegir/email string aegir@example.com
-aegir3-hostmaster aegir/site string aegir.example.com
+aegir3-hostmaster aegir/email string  aegir@example.com
+aegir3-hostmaster aegir/site  string  aegir.example.com
 postfix postfix/main_mailer_type select Local only
-aegir3-provision aegir/drush_version string 8.3.4
+
 EOF
 
 echo "[CI] Pre-installing dependencies"
-sudo apt install --yes mysql-server mysql-client
+sudo apt-get install --yes mysql-server mysql-client php7.4-mysql php7.4-cli php7.4-gd php7.4 postfix
 
 echo "[CI] Installing .deb files .. will fail on missing packages"
-sudo DPKG_DEBUG=developer apt install --yes ./build/aegir3_*.deb ./build/aegir3-provision*.deb ./build/aegir3-hostmaster*.deb
+sudo DPKG_DEBUG=developer dpkg --install build/aegir3_*.deb build/aegir3-provision*.deb build/aegir3-hostmaster*.deb
 
 echo "[CI] Installing remaining packages and configuring our debs"
-sudo DPKG_DEBUG=developer apt install --fix-broken --yes
+sudo apt-get install --fix-broken --yes
+