diff --git a/install/minthcm-install.sh b/install/minthcm-install.sh
index 090a31135..a0e3b8310 100644
--- a/install/minthcm-install.sh
+++ b/install/minthcm-install.sh
@@ -12,14 +12,13 @@ catch_errors
 setting_up_container
 network_check
 update_os
-PHP_VERSION="8.2"
-PHP_APACHE="YES" PHP_MODULE="mysql,cli,redis" PHP_FPM="YES" setup_php
-setup_composer
 
-msg_info "Enabling Apache modules (rewrite, headers)"
-$STD a2enmod rewrite
-$STD a2enmod headers
-msg_ok "Enabled Apache modules (rewrite, headers)"
+PHP_VERSION="8.2"
+PHP_APACHE="YES" PHP_MODULE="mysql,redis" PHP_FPM="YES" setup_php
+setup_composer
+setup_mariadb
+MARIADB_DB_NAME="minthcm" MARIADB_DB_USER="minthcm" setup_mariadb_db
+$STD mariadb -u root -e "SET GLOBAL sql_mode='STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION'";
 
 fetch_and_deploy_gh_release "MintHCM" "minthcm/minthcm" "tarball" "latest" "/var/www/MintHCM"
 
@@ -37,19 +36,17 @@ mkdir -p /var/www/script
 cp /var/www/MintHCM/docker/script/generate_config.php /var/www/script/generate_config.php
 cp /var/www/MintHCM/docker/.env /var/www/script/.env
 chown -R www-data:www-data /var/www/script
-msg_ok "Configured MintHCM"
-
-msg_info "Restarting Apache2"
+$STD a2enmod rewrite
+$STD a2enmod headers
 $STD systemctl restart apache2
-msg_ok "Restarted Apache2"
+msg_ok "Configured MintHCM"
 
 msg_info "Setting up Elasticsearch"
 setup_deb822_repo \
   "elasticsearch" \
   "https://artifacts.elastic.co/GPG-KEY-elasticsearch" \
   "https://artifacts.elastic.co/packages/7.x/apt" \
-  "stable" \
-  "main"
+  "stable"
 $STD apt install -y elasticsearch
 echo "-Xms2g" >>/etc/elasticsearch/jvm.options
 echo "-Xmx2g" >>/etc/elasticsearch/jvm.options
@@ -57,35 +54,22 @@ $STD /usr/share/elasticsearch/bin/elasticsearch-plugin install ingest-attachment
 systemctl enable -q --now elasticsearch
 msg_ok "Set up Elasticsearch"
 
-setup_mariadb
-msg_info "Setting up MariaDB"
-$STD mariadb -u root -e "SET GLOBAL sql_mode='STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION'";
-msg_ok "Set up MariaDB"
-
 msg_info "Configuring Database"
-DB_PASS=$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | head -c13)
-$STD mariadb -u root -e "CREATE USER 'minthcm'@'localhost' IDENTIFIED BY '${DB_PASS}';"
-$STD mariadb -u root -e "GRANT ALL ON *.* TO 'minthcm'@'localhost'; FLUSH PRIVILEGES;"
-sed -i 's/^DB_HOST=.*/DB_HOST=localhost/' /var/www/script/.env
-sed -i 's/^DB_USER=.*/DB_USER=minthcm/' /var/www/script/.env
-sed -i "s/^DB_PASS=.*/DB_PASS=${DB_PASS}/" /var/www/script/.env
-sed -i 's/^ELASTICSEARCH_HOST=.*/ELASTICSEARCH_HOST=localhost/' /var/www/script/.env
-msg_ok "Configured MariaDB"
-{
-  echo "MintHCM DB Credentials"
-  echo "MariaDB User: minthcm"
-  echo "MariaDB Password: $DB_PASS"
-} >>~/minthcm.creds
+sed -i "s/^DB_HOST=.*/DB_HOST=localhost/" /var/www/script/.env
+sed -i "s/^DB_USER=.*/DB_USER=$MARIADB_DB_USER/" /var/www/script/.env
+sed -i "s/^DB_PASS=.*/DB_PASS=$MARIADB_DB_PASS/" /var/www/script/.env
+sed -i "s/^ELASTICSEARCH_HOST=.*/ELASTICSEARCH_HOST=localhost/" /var/www/script/.env
+msg_ok "Configured Database"
 
 msg_info "Generating configuration file"
 set -a
 source /var/www/script/.env
 set +a
-php /var/www/script/generate_config.php
+$STD php /var/www/script/generate_config.php
 msg_ok "Generated configuration file"
 
 msg_info "Installing MintHCM"
-cd /var/www/MintHCM && su -s /bin/bash -c 'php /var/www/MintHCM/MintCLI install < /var/www/MintHCM/configMint4' www-data
+$STD sudo -u www-data php /var/www/MintHCM/MintCLI install < /var/www/MintHCM/configMint4
 printf "*    *    *    *    *     cd /var/www/MintHCM/legacy; php -f cron.php > /dev/null 2>&1\n" > /var/spool/cron/crontabs/www-data
 service cron start
 rm -f /var/www/MintHCM/configMint4