diff --git a/install/passbolt-install.sh b/install/passbolt-install.sh
index 5a1d36b4c..eb3ebef0c 100644
--- a/install/passbolt-install.sh
+++ b/install/passbolt-install.sh
@@ -21,18 +21,18 @@ $STD apt install -y \
 msg_ok "Installed dependencies"
 
 setup_mariadb
-MARIADB_DB_NAME="passboltdb" MARIADB_DB_USER="passbolt" MARIADB_DB_PASS="$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | head -c13)" setup_mariadb_db
+MARIADB_DB_NAME="passboltdb" MARIADB_DB_USER="passbolt" setup_mariadb_db
+create_self_signed_cert
+import_local_ip
 setup_deb822_repo \
   "passbolt" \
   "https://keys.openpgp.org/pks/lookup?op=get&options=mr&search=0x3D1A0346C8E1802F774AEF21DE8B853FC155581D" \
   "https://download.passbolt.com/ce/debian" \
   "buster" \
   "stable"
-create_self_signed_cert "passbolt"
 
 msg_info "Setting up Passbolt (Patience)"
 export DEBIAN_FRONTEND=noninteractive
-IP_ADDR=$(hostname -I | awk '{print $1}')
 echo passbolt-ce-server passbolt/mysql-configuration boolean true | debconf-set-selections
 echo passbolt-ce-server passbolt/mysql-passbolt-username string $MARIADB_DB_USER | debconf-set-selections
 echo passbolt-ce-server passbolt/mysql-passbolt-password password $MARIADB_DB_PASS | debconf-set-selections
@@ -40,7 +40,7 @@ echo passbolt-ce-server passbolt/mysql-passbolt-password-repeat password $MARIAD
 echo passbolt-ce-server passbolt/mysql-passbolt-dbname string $MARIADB_DB_NAME | debconf-set-selections
 echo passbolt-ce-server passbolt/nginx-configuration boolean true | debconf-set-selections
 echo passbolt-ce-server passbolt/nginx-configuration-three-choices select manual | debconf-set-selections
-echo passbolt-ce-server passbolt/nginx-domain string $IP_ADDR | debconf-set-selections
+echo passbolt-ce-server passbolt/nginx-domain string $LOCAL_IP | debconf-set-selections
 echo passbolt-ce-server passbolt/nginx-certificate-file string /etc/ssl/passbolt/passbolt.crt | debconf-set-selections
 echo passbolt-ce-server passbolt/nginx-certificate-key-file string /etc/ssl/passbolt/passbolt.key | debconf-set-selections
 $STD apt install -y --no-install-recommends passbolt-ce-server