diff --git a/setup/gen_config.py b/setup/gen_config.py
index 1c36eec22..4e6cd4c68 100644
--- a/setup/gen_config.py
+++ b/setup/gen_config.py
@@ -35,10 +35,12 @@ def main():
     parser.add_argument('--addons_path', type=str, help='')
     parser.add_argument('--db_filter', type=str, help='')
     parser.add_argument('--db_port', type=int, help='')
+    parser.add_argument('--db_server', type=int, help='')
     args = parser.parse_args()
     db_port = args.db_port
     db_user = args.db_user
     db_pass = args.db_pass
+    db_server = args.db_server
     app_port = find_available_port(8069)
     addons_path = args.addons_path
     base_dir= args.deploy_path
@@ -51,7 +53,7 @@ def main():
     # Update Odoo configuration file
     config = configparser.ConfigParser()
     config.read(f'{base_dir}/odoo.conf')
-    config['options']['db_host'] = "localhost"
+    config['options']['db_host'] = db_server
     config['options']['db_user'] = db_user
     config['options']['db_password'] = db_pass
     config['options']['db_port'] = str(db_port)
diff --git a/setup/init_config.sh b/setup/init_config.sh
index 1ede58017..c99d1b9ae 100755
--- a/setup/init_config.sh
+++ b/setup/init_config.sh
@@ -213,7 +213,7 @@ else
     psql "postgresql://${DB_USER}:${DB_PASSWORD}@${DB_SERVER}:${DB_PORT}/postgres" -c "ALTER USER $USER WITH PASSWORD '$PASSWORD';"
 fi
     ${PYTHON} "$SETUP_PATH/gen_config.py" --db_user $USER --db_pass $PASSWORD --deploy_path "$(pwd)" \
-    --addons_path $ADDONS --db_port $DB_PORT
+    --addons_path $ADDONS --db_port $DB_PORT --db_server $DB_SERVER
     Show 0 " Generate Config Complete"
 }
 main(){