diff --git a/db/create.sql b/db/create.sql
index 2052e637..f393a9f7 100644
--- a/db/create.sql
+++ b/db/create.sql
@@ -1,9 +1,9 @@
 DROP DATABASE IF EXISTS fittrackee;
 DROP DATABASE IF EXISTS fittrackee_test;
+DROP SCHEMA IF EXISTS fittrackee;
 DROP USER IF EXISTS fittrackee;
 
-CREATE DATABASE fittrackee;
-CREATE DATABASE fittrackee_test;
 CREATE USER fittrackee WITH PASSWORD 'fittrackee';
-GRANT ALL PRIVILEGES ON DATABASE fittrackee TO fittrackee;
-GRANT ALL PRIVILEGES ON DATABASE fittrackee_test TO fittrackee;
+CREATE SCHEMA fittrackee AUTHORIZATION fittrackee;
+CREATE DATABASE fittrackee OWNER fittrackee;
+CREATE DATABASE fittrackee_test OWNER fittrackee;