diff --git a/installer/build/scripts/harbor/configure_harbor.sh b/installer/build/scripts/harbor/configure_harbor.sh
index c8aa9e36e9..1d087527d3 100755
--- a/installer/build/scripts/harbor/configure_harbor.sh
+++ b/installer/build/scripts/harbor/configure_harbor.sh
@@ -115,9 +115,10 @@ configureHarborCfg ssl_cert $appliance_tls_cert
 configureHarborCfg ssl_cert_key $appliance_tls_key
 configureHarborCfg secretkey_path $data_dir
 
-# Set MySQL and Clair DB passwords on first boot
-configureHarborCfgOnce db_password "$(genPass)"
-configureHarborCfgOnce clair_db_password "$(genPass)"
+# Set Harbor DB and Clair DB passwords on first boot
+random_pwd=$(genPass)
+configureHarborCfgOnce db_password "$random_pwd"
+configureHarborCfgOnce clair_db_password "$random_pwd"
 
 setPortInYAML $harbor_compose_file "${REGISTRY_PORT}" "${NOTARY_PORT}"