diff --git a/bench/config/common_site_config.py b/bench/config/common_site_config.py
index 02c6778a..d71d9efd 100644
--- a/bench/config/common_site_config.py
+++ b/bench/config/common_site_config.py
@@ -55,7 +55,7 @@ def get_gunicorn_workers():
 	'''This function will return the maximum workers that can be started depending upon
 	number of cpu's present on the machine'''
 	return {
-		"gunicorn_workers": multiprocessing.cpu_count()
+		"gunicorn_workers": multiprocessing.cpu_count() * 2 + 1
 	}
 
 def update_config_for_frappe(config, bench_path):
diff --git a/bench/playbooks/roles/bench/tasks/setup_erpnext.yml b/bench/playbooks/roles/bench/tasks/setup_erpnext.yml
index 32e498d1..9db153ab 100644
--- a/bench/playbooks/roles/bench/tasks/setup_erpnext.yml
+++ b/bench/playbooks/roles/bench/tasks/setup_erpnext.yml
@@ -13,16 +13,17 @@
   - name: Check whether the site already exists
     stat: path="{{ bench_path }}/sites/{{ site }}"
     register: site_folder
+    when: not without_site
 
   - name: Create a new site
     command: "bench new-site {{ site }} --admin-password '{{ admin_password }}' --mariadb-root-password '{{ mysql_root_password }}'"
     args:
       chdir: "{{ bench_path }}"
-    when: not site_folder.stat.exists
+    when: not without_site and not site_folder.stat.exists
 
   - name: Install ERPNext to default site
     command: "bench --site {{ site }} install-app erpnext"
     args:
       chdir: "{{ bench_path }}"
-    when: not without_erpnext
+    when: not without_site and not without_erpnext
 ...
\ No newline at end of file
diff --git a/bench/playbooks/roles/mariadb/tasks/main.yml b/bench/playbooks/roles/mariadb/tasks/main.yml
index 1f119005..8079583d 100644
--- a/bench/playbooks/roles/mariadb/tasks/main.yml
+++ b/bench/playbooks/roles/mariadb/tasks/main.yml
@@ -48,6 +48,10 @@
       [mysqld]
       pid-file        = /var/run/mysqld/mysqld.pid
       socket          = /var/run/mysqld/mysqld.sock
+
+      # setting appeared inside mysql but overwritten by mariadb inside mariadb.conf.d/xx-server.cnf valued as utf8mb4_general_ci
+
+      collation-server = utf8mb4_unicode_ci
     create: yes
   become: yes
   become_user: root
diff --git a/install.py b/install.py
index b5bd43f5..7a33ba11 100644
--- a/install.py
+++ b/install.py
@@ -327,8 +327,8 @@ def get_passwords(args):
 					mysql_root_password = ''
 					continue
 
-			# admin password
-			if not admin_password:
+			# admin password, only needed if we're also creating a site
+			if not admin_password and not args.without_site:
 				admin_password = getpass.unix_getpass(prompt='Please enter the default Administrator user password: ')
 				conf_admin_passswd = getpass.unix_getpass(prompt='Re-enter Administrator password: ')