diff --git a/config/dbconn.ts b/config/dbconn.ts
index 1d12453415d354aa912f590409197e637c21196d..f80f3bd010c54e1c9d409d650ba9a24a61007707 100644
--- a/config/dbconn.ts
+++ b/config/dbconn.ts
@@ -4,35 +4,34 @@ var env = process.env.NODE_ENV || 'testing';
 const config = require('./config')[env]
 
 // ==== USER ACOOUNT DB CONNECTION ====
-var userConnection = mysql.createConnection({
+const userConnection = mysql.createPool({
     host: config.database.host,
     user: config.database.user,
     password: config.database.password,
     port: config.database.port,
     database: config.database.dbUser,
-    multipleStatements: true
+    waitForConnections: true,
+    connectionLimit: 10,
+    queueLimit: 0
 })
 
-userConnection.connect(function(err) {
-    if (err) throw err;
-})
 userConnection.query('USE '+config.database.dbUser)
 
 // ==== PROJECT DB CONNECTION ====
-var projectConnection = mysql.createConnection({
+const projectConnection = mysql.createPool({
     host: config.database.host_project,
     user: config.database.user,
     password: config.database.password,
     port: config.database.port,
-    database: config.database.dbProject
+    database: config.database.dbProject,
+    waitForConnections: true,
+    connectionLimit: 10,
+    queueLimit: 0
 })
 
-projectConnection.connect(function(err) {
-    if (err) throw err;
-})
 projectConnection.query('USE '+config.database.dbProject)
 
-var connection = {
+const connection = {
     user: userConnection,
     project: projectConnection
 }