diff --git a/config/environments/development.js b/config/environments/development.js
index 0d6ba3f..25988f7 100644
--- a/config/environments/development.js
+++ b/config/environments/development.js
@@ -14,7 +14,7 @@ module.exports = {
 
     server: {
         hostname: process.env.HOSTNAME || '127.0.0.1',
-        port: process.env.PORT || 1337
+        port: process.env.PORT || 18888
     },
 
     paginate: {
diff --git a/config/environments/production.js b/config/environments/production.js
index 9ea138f..43d7f12 100644
--- a/config/environments/production.js
+++ b/config/environments/production.js
@@ -22,6 +22,6 @@ module.exports = {
 
     server: {
         hostname: process.env.HOSTNAME || '127.0.0.1',
-        port: process.env.PORT || 80
+        port: process.env.PORT || 18888
     }
 }
diff --git a/package.json b/package.json
index 880ef53..fdc734f 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   "main": "server.js",
   "scripts": {
     "start": "NODE_ENV=development nodemon server.js",
-    "start:prod": "NODE_ENV=production pm2 start server.js -n 'api' -i 0",
+    "start:prod": "NODE_ENV=production pm2 start server.js -n 'api2' -i 0",
     "lint": "eslint **/*.js --quiet",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
diff --git a/server.js b/server.js
index 0345504..f6df082 100644
--- a/server.js
+++ b/server.js
@@ -10,8 +10,8 @@ const { express, logger, models } = require('./core');
 const currentState = assign({
     launchedAt: Date.now(),
     appPath: process.cwd(),
-    host: process.env.HOST || process.env.HOSTNAME || 'localhost',
-    port: process.env.PORT || 1337,
+    //host: process.env.HOST || process.env.HOSTNAME || 'localhost',
+    //port: process.env.PORT || 18888,
     environment: toLower(process.env.NODE_ENV) || 'development',
     connections: {}
 }, config);
@@ -51,7 +51,7 @@ server.on('error', err => {
 try {
     models.sequelize.sync({ force: false }).then(() => {
         // Launch server.
-        server.listen(currentState.port, (err) => {
+        server.listen(currentState.server.port, (err) => {
             if (err) {
                 logger.debug(`⚠️ Server wasn't able to start properly.`);
                 logger.error(err);
@@ -64,7 +64,7 @@ try {
             logger.info('Process PID: ' + process.pid);
             //logger.info(`Version: ${this.config.info.strapi} (node v${this.config.info.node})`);
             logger.info('To shut down your server, press <CTRL> + C at any time');
-            logger.info(`⚡️ Server: http://${currentState.host}:${currentState.port}`);
+            logger.info(`⚡️ Server: http://${currentState.server.hostname}:${currentState.server.port}`);
             
         });
     });