diff --git a/.env b/.env
index c6891bf..de9a821 100644
--- a/.env
+++ b/.env
@@ -15,11 +15,11 @@ COUCHDB_DESIGN="headup_app"
 COUCHDB_CREDENTIAL="cmFtcGV1cjpES3hwMjRQUw=="
 SKYDIVERID_API_URL="https://skydiver.id/api"
 SKYDIVERID_API_TOKEN="xmqzgnGYMD.OJgFw1pCXCpJFGmZfSjmWK8lrpqAQNnu"
-MYSQL_DBNAME="c4adastracomdb2"
-MYSQL_DBUSER="c4adastracomu2"
+MYSQL_DBNAME="c4adastracomdb3"
+MYSQL_DBUSER="c4adastracomu1"
 MYSQL_DBPASS="kbrnrt5jPK12"
 MYSQL_DBHOST="ns388640.ip-176-31-255.eu"
 MYSQL_DBPORT=3306
 MYSQL_DBTYPE="mysql"
-MYSQL_DATABASE_URL="mysql://c4adastracomu2:kbrnrt5jPK12@ns388640.ip-176-31-255.eu:3306/c4adastracomdb2"
-MYSQL_DATABASE_URL_DEV="mysql://c4adastracomu2:kbrnrt5jPK12@ns388640.ip-176-31-255.eu:3306/c4adastracomdb2"
\ No newline at end of file
+MYSQL_DATABASE_URL="mysql://c4adastracomu1:kbrnrt5jPK12@ns388640.ip-176-31-255.eu:3306/c4adastracomdb3"
+MYSQL_DATABASE_URL_DEV="mysql://c4adastracomu1:kbrnrt5jPK12@ns388640.ip-176-31-255.eu:3306/c4adastracomdb3"
\ No newline at end of file
diff --git a/.env.development b/.env.development
index 39a5916..ff47a9d 100644
--- a/.env.development
+++ b/.env.development
@@ -15,11 +15,11 @@ COUCHDB_DESIGN="headup_app"
 COUCHDB_CREDENTIAL="cmFtcGV1cjpES3hwMjRQUw=="
 SKYDIVERID_API_URL="https://skydiver.id/api"
 SKYDIVERID_API_TOKEN="xmqzgnGYMD.OJgFw1pCXCpJFGmZfSjmWK8lrpqAQNnu"
-MYSQL_DBNAME="c4adastracomdb2"
-MYSQL_DBUSER="c4adastracomu2"
+MYSQL_DBNAME="c4adastracomdb3"
+MYSQL_DBUSER="c4adastracomu1"
 MYSQL_DBPASS="kbrnrt5jPK12"
 MYSQL_DBHOST="ns388640.ip-176-31-255.eu"
 MYSQL_DBPORT=3306
 MYSQL_DBTYPE="mysql"
-MYSQL_DATABASE_URL="mysql://c4adastracomu2:kbrnrt5jPK12@ns388640.ip-176-31-255.eu:3306/c4adastracomdb2"
-MYSQL_DATABASE_URL_DEV="mysql://c4adastracomu2:kbrnrt5jPK12@ns388640.ip-176-31-255.eu:3306/c4adastracomdb2"
\ No newline at end of file
+MYSQL_DATABASE_URL="mysql://c4adastracomu1:kbrnrt5jPK12@ns388640.ip-176-31-255.eu:3306/c4adastracomdb3"
+MYSQL_DATABASE_URL_DEV="mysql://c4adastracomu1:kbrnrt5jPK12@ns388640.ip-176-31-255.eu:3306/c4adastracomdb3"
\ No newline at end of file
diff --git a/.env.local b/.env.local
index 5b1733a..6422e15 100644
--- a/.env.local
+++ b/.env.local
@@ -15,11 +15,11 @@ COUCHDB_DESIGN="headup_app"
 COUCHDB_CREDENTIAL="cmFtcGV1cjpES3hwMjRQUw=="
 SKYDIVERID_API_URL="https://skydiver.id/api"
 SKYDIVERID_API_TOKEN="xmqzgnGYMD.OJgFw1pCXCpJFGmZfSjmWK8lrpqAQNnu"
-MYSQL_DBNAME="c4adastracomdb2"
-MYSQL_DBUSER="c4adastracomu2"
+MYSQL_DBNAME="c4adastracomdb3"
+MYSQL_DBUSER="c4adastracomu1"
 MYSQL_DBPASS="kbrnrt5jPK12"
 MYSQL_DBHOST="ns388640.ip-176-31-255.eu"
 MYSQL_DBPORT=3306
 MYSQL_DBTYPE="mysql"
-MYSQL_DATABASE_URL="mysql://c4adastracomu2:kbrnrt5jPK12@ns388640.ip-176-31-255.eu:3306/c4adastracomdb2"
-MYSQL_DATABASE_URL_DEV="mysql://c4adastracomu2:kbrnrt5jPK12@ns388640.ip-176-31-255.eu:3306/c4adastracomdb2"
+MYSQL_DATABASE_URL="mysql://c4adastracomu1:kbrnrt5jPK12@ns388640.ip-176-31-255.eu:3306/c4adastracomdb3"
+MYSQL_DATABASE_URL_DEV="mysql://c4adastracomu1:kbrnrt5jPK12@ns388640.ip-176-31-255.eu:3306/c4adastracomdb3"
diff --git a/.env.production b/.env.production
index bfaa5ac..298e5ed 100644
--- a/.env.production
+++ b/.env.production
@@ -15,11 +15,11 @@ COUCHDB_DESIGN="headup_app"
 COUCHDB_CREDENTIAL="cmFtcGV1cjpES3hwMjRQUw=="
 SKYDIVERID_API_URL="https://skydiver.id/api"
 SKYDIVERID_API_TOKEN="xmqzgnGYMD.OJgFw1pCXCpJFGmZfSjmWK8lrpqAQNnu"
-MYSQL_DBNAME="c4adastracomdb2"
-MYSQL_DBUSER="c4adastracomu2"
+MYSQL_DBNAME="c4adastracomdb3"
+MYSQL_DBUSER="c4adastracomu1"
 MYSQL_DBPASS="kbrnrt5jPK12"
 MYSQL_DBHOST="ns388640.ip-176-31-255.eu"
 MYSQL_DBPORT=3306
 MYSQL_DBTYPE="mysql"
-MYSQL_DATABASE_URL="mysql://c4adastracomu2:kbrnrt5jPK12@ns388640.ip-176-31-255.eu:3306/c4adastracomdb2"
-MYSQL_DATABASE_URL_DEV="mysql://c4adastracomu2:kbrnrt5jPK12@ns388640.ip-176-31-255.eu:3306/c4adastracomdb2"
+MYSQL_DATABASE_URL="mysql://c4adastracomu1:kbrnrt5jPK12@ns388640.ip-176-31-255.eu:3306/c4adastracomdb3"
+MYSQL_DATABASE_URL_DEV="mysql://c4adastracomu1:kbrnrt5jPK12@ns388640.ip-176-31-255.eu:3306/c4adastracomdb3"
diff --git a/src/database/config/db.config.js b/src/database/config/db.config.js
index 059f957..510adab 100644
--- a/src/database/config/db.config.js
+++ b/src/database/config/db.config.js
@@ -1,19 +1,23 @@
+// Load environment variables from .env file
+const appEnv = process.env.APP_ENV || 'development';
+require('dotenv').config({ path: `.env.${appEnv}` });
+
 module.exports = {
     "development": {
-        "username": process.env.MYSQL_DBUSER,
-        "password": process.env.MYSQL_DBPASS,
-        "database": process.env.MYSQL_DBNAME,
-        "host": process.env.MYSQL_DBHOST,
-        "port": process.env.MYSQL_DBPORT,
-        "dialect": process.env.MYSQL_DBTYPE
+        "username": process.env.MYSQL_DBUSER || 'root',
+        "password": process.env.MYSQL_DBPASS || '',
+        "database": process.env.MYSQL_DBNAME || 'adastra_dev',
+        "host": process.env.MYSQL_DBHOST || 'localhost',
+        "port": process.env.MYSQL_DBPORT || 3306,
+        "dialect": process.env.MYSQL_DBTYPE || 'mysql'
     },
     "test": {
-        "username": process.env.MYSQL_DBUSER,
-        "password": process.env.MYSQL_DBPASS,
-        "database": process.env.MYSQL_DBNAME,
-        "host": process.env.MYSQL_DBHOST,
-        "port": process.env.MYSQL_DBPORT,
-        "dialect": process.env.MYSQL_DBTYPE
+        "username": process.env.MYSQL_DBUSER || 'root',
+        "password": process.env.MYSQL_DBPASS || '',
+        "database": process.env.MYSQL_DBNAME || 'adastra_test',
+        "host": process.env.MYSQL_DBHOST || 'localhost',
+        "port": process.env.MYSQL_DBPORT || 3306,
+        "dialect": process.env.MYSQL_DBTYPE || 'mysql'
     },
     "production": {
         "username": process.env.MYSQL_DBUSER,
@@ -21,13 +25,13 @@ module.exports = {
         "database": process.env.MYSQL_DBNAME,
         "host": process.env.MYSQL_DBHOST,
         "port": process.env.MYSQL_DBPORT,
-        "dialect": process.env.MYSQL_DBTYPE,
+        "dialect": process.env.MYSQL_DBTYPE || 'mysql',
         "dialectOptions": {
-          "ssl": {
-            // enable this for production environment only if using a secure connection
-            "require": true,
-            "rejectUnauthorized": false
-          },
+            "ssl": {
+                // enable this for production environment only if using a secure connection
+                "require": true,
+                "rejectUnauthorized": false
+            },
         }
     }
 }
\ No newline at end of file