diff --git a/api/package.json b/api/package.json
index b20b5ce..00030ab 100644
--- a/api/package.json
+++ b/api/package.json
@@ -6,7 +6,7 @@
   "scripts": {
     "start": "nodemon --exec ts-node --files src/index.ts",
     "start:test": "cross-env NODE_ENV='test' DB_DATABASE='jira_test' npm start",
-    "start:production": "cross-env NODE_ENV=production pm2 start node -- -r ./tsconfig-paths.js build/index.js",
+    "start:production": "pm2 start node -- -r ./tsconfig-paths.js build/index.js",
     "build": "cd src && tsc",
     "pre-commit": "lint-staged"
   },
diff --git a/client/src/shared/utils/api.js b/client/src/shared/utils/api.js
index 6caf768..d16feb8 100644
--- a/client/src/shared/utils/api.js
+++ b/client/src/shared/utils/api.js
@@ -6,7 +6,7 @@ import { objectToQueryString } from 'shared/utils/url';
 import { getStoredAuthToken, removeStoredAuthToken } from 'shared/utils/authToken';
 
 const defaults = {
-  baseURL: `http://localhost:${process.env.PORT || 3000}`,
+  baseURL: `http://localhost:${process.env.API_PORT || 3000}`,
   headers: () => ({
     'Content-Type': 'application/json',
     Authorization: getStoredAuthToken() ? `Bearer ${getStoredAuthToken()}` : undefined,
diff --git a/client/webpack.config.production.js b/client/webpack.config.production.js
index ab20ff8..b8a2723 100644
--- a/client/webpack.config.production.js
+++ b/client/webpack.config.production.js
@@ -58,6 +58,12 @@ module.exports = {
       template: path.join(__dirname, 'src/index.html'),
       favicon: path.join(__dirname, 'src/favicon.png'),
     }),
+    new webpack.DefinePlugin({
+      'process.env': {
+        NODE_ENV: JSON.stringify('production'),
+        API_PORT: JSON.stringify('3001'),
+      },
+    }),
     new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
   ],
 };