diff --git a/app.js b/app.js
index 8621d76..521972c 100644
--- a/app.js
+++ b/app.js
@@ -21,10 +21,6 @@ const passport = require('./config/passport');
 
 app.use(passport.initialize());
 
-if (process.env.NODE_ENV === 'prod') {
-  app.use(express.static(path.join(__dirname, 'react/build')));
-}
-
 app.use('/api/users', require('./routes/users'));
 
 const auth = require('./routes/auth');
@@ -32,6 +28,11 @@ const auth = require('./routes/auth');
 app.use('/api/lists', auth.required, require('./routes/lists'));
 app.use('/api/todos', auth.required, require('./routes/todos'));
 
+if (process.env.NODE_ENV === 'prod') {
+  app.use(express.static(path.join(__dirname, 'react/build')));
+  app.use('*', express.static(path.join(__dirname, 'react/build/index.html')));
+}
+
 // 404 route
 app.use((req, res) => {
   res.status(404);
diff --git a/config/index.js b/config/index.js
index 8decc31..f8adad0 100644
--- a/config/index.js
+++ b/config/index.js
@@ -2,17 +2,17 @@ const env = process.env.NODE_ENV;
 
 const prod = {
   app: {
-    port: process.env.APP_PORT,
+    port: process.env.PORT,
   },
   db: {
-    uri: process.env.DB_URI,
+    uri: process.env.DB_URI || process.env.MONGODB_URI,
   },
   secret: process.env.SECRET,
 };
 
 const dev = {
   app: {
-    port: process.env.DEV_APP_PORT || 4000,
+    port: process.env.DEV_PORT || 4000,
   },
   db: {
     uri: process.env.DEV_DB_URI || 'mongodb://localhost/todolist',
diff --git a/package.json b/package.json
index fefef00..cb1b1d8 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,8 @@
   "scripts": {
     "start": "node ./app.js",
     "debug": "cross-env NODE_ENV=dev npx nodemon --inspect ./app.js",
-    "test": "cross-env NODE_ENV=test jest"
+    "test": "cross-env NODE_ENV=test jest",
+    "heroku-postbuild": "cd react && npm i && npm run build"
   },
   "author": "",
   "dependencies": {