diff --git a/frontends/mit-open/package.json b/frontends/mit-open/package.json
index d5cc76ced5..c1ebc57829 100644
--- a/frontends/mit-open/package.json
+++ b/frontends/mit-open/package.json
@@ -9,7 +9,7 @@
   },
   "scripts": {
     "watch": "NODE_ENV=development ENVIRONMENT=local webpack serve",
-    "watch:docker": "API_DEV_PROXY_BASE_URL=http://nginx:8063 NODE_ENV=development ENVIRONMENT=local webpack serve",
+    "watch:docker": "API_DEV_PROXY_BASE_URL=http://nginx:8063 NODE_ENV=development ENVIRONMENT=docker webpack serve",
     "watch:rc": "API_DEV_PROXY_BASE_URL=https://api.mitopen-rc.odl.mit.edu/ NODE_ENV=development ENVIRONMENT=local webpack serve",
     "build": "webpack --config webpack.config.js --bail",
     "build-exports": "webpack --config webpack.exports.js --bail",
diff --git a/frontends/mit-open/webpack.config.js b/frontends/mit-open/webpack.config.js
index 931ab9cc48..aa5b56c18c 100644
--- a/frontends/mit-open/webpack.config.js
+++ b/frontends/mit-open/webpack.config.js
@@ -1,8 +1,18 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 const path = require("path")
-require("dotenv").config({
-  path: path.resolve(__dirname, "../../.env"),
-})
+
+if (process.env.ENVIRONMENT === "local") {
+  console.info("Loading environment from .env files")
+  require("dotenv").config({
+    path: [
+      path.resolve(__dirname, "../../env/frontend.local.env"),
+      path.resolve(__dirname, "../../env/frontend.env"),
+      path.resolve(__dirname, "../../env/shared.local.env"),
+      path.resolve(__dirname, "../../env/shared.env"),
+      path.resolve(__dirname, "../../.env"),
+    ],
+  })
+}
 
 const webpack = require("webpack")
 const BundleTracker = require("webpack-bundle-tracker")
@@ -258,7 +268,7 @@ module.exports = (env, argv) => {
       devMiddleware: {
         writeToDisk: true,
       },
-      host: ENVIRONMENT === "docker" ? "0.0.0.0" : "::",
+      host: "0.0.0.0",
       proxy: [
         {
           context: [