diff --git a/client/gulp/config.js b/client/gulp/config.js
index 5e0991f6..86e35dc7 100644
--- a/client/gulp/config.js
+++ b/client/gulp/config.js
@@ -2,7 +2,7 @@
 
 module.exports = {
 
-  'serverport': 4000,
+  'serverport': 3000,
 
   'scripts': {
     'src': './src/*.js',
diff --git a/server/config.php b/server/config.php
index 99e195be..4871c4d7 100755
--- a/server/config.php
+++ b/server/config.php
@@ -1,5 +1,15 @@
 <?php
-define('MYSQL_HOST', 'localhost');
-define('MYSQL_USER', 'root');
-define('MYSQL_PASSWORD', '');
-define('MYSQL_DATABASE', 'development');
+$env['MYSQL_SERVER']   = getenv('MYSQL_SERVER');
+$env['MYSQL_USER']     = getenv('MYSQL_USER');
+$env['MYSQL_PASSWORD'] = getenv('MYSQL_PASSWORD');
+$env['MYSQL_DATABASE'] = getenv('MYSQL_DATABASE');
+
+$mysql_host       = ($env['MYSQL_SERVER'])   ? $env['MYSQL_SERVER']   : 'localhost';
+$mysql_user       = ($env['MYSQL_USER'])     ? $env['MYSQL_USER']     : 'root';
+$mysql_password   = ($env['MYSQL_PASSWORD']) ? $env['MYSQL_PASSWORD'] : '';
+$mysql_database   = ($env['MYSQL_DATABASE']) ? $env['MYSQL_DATABASE'] : 'development';
+
+define('MYSQL_HOST', $mysql_host);
+define('MYSQL_USER', $mysql_user);
+define('MYSQL_PASSWORD', $mysql_password);
+define('MYSQL_DATABASE', $mysql_database);
\ No newline at end of file