diff --git a/roles/phabricator/tasks/main.yml b/roles/phabricator/tasks/main.yml
index a15a08665e..7e22e2c5c5 100644
--- a/roles/phabricator/tasks/main.yml
+++ b/roles/phabricator/tasks/main.yml
@@ -16,10 +16,6 @@
     - arcanist
     - phabricator
 
-- name: create mariadb database
-  delegate_to: "{{ mariadb_host }}"
-  mysql_db: name={{ phabricator_db_name }}
-
 - name: create mariadb user for phabricator
   delegate_to: "{{ mariadb_host }}"
   mysql_user: name={{ mariadb_user }} host={{ eth0_ip }} password={{ mariadb_password }} priv=*.*:ALL,CREATE state=present
diff --git a/roles/phabricator/templates/local.json.j2 b/roles/phabricator/templates/local.json.j2
index 6718a5e3bc..942fbb984f 100644
--- a/roles/phabricator/templates/local.json.j2
+++ b/roles/phabricator/templates/local.json.j2
@@ -5,7 +5,7 @@
   "mysql.host" : "{{ mariadb_host }}",
   "mysql.user" : "{{ mariadb_user }}",
   "mysql.pass" : "{{ mariadb_password }}",
-  "storage.default-namespace" : "phabricatorstg",
+  "storage.default-namespace" : "{{ phabricator_db_prefix }}",
   "load-libraries"       : [],
   "log.access.path" : "/var/log/phabricator/access.log",
   "log.ssh.path" : "/var/log/phabricator/ssh.log",