diff --git a/config/custom-environment-variables.json b/config/custom-environment-variables.json
index d3ae6a5ab3b..f13512ab5b9 100644
--- a/config/custom-environment-variables.json
+++ b/config/custom-environment-variables.json
@@ -2,6 +2,7 @@
   "amoCDN": "AMO_CDN",
   "apiHost": "API_HOST",
   "CSP": "CSP",
+  "fxaConfig": "FXA_CONFIG",
   "proxyApiHost": "PROXY_API_HOST",
   "proxyEnabled": "PROXY_ENABLED",
   "proxyPort": "PROXY_PORT",
diff --git a/package.json b/package.json
index a680bfc4db5..2a1aaa451a9 100644
--- a/package.json
+++ b/package.json
@@ -50,10 +50,11 @@
       }
     },
     "amo:dev": {
-      "command": "better-npm-run start-dev",
+      "command": "better-npm-run start-dev-proxy",
       "env": {
         "AMO_CDN": "https://addons-amo-dev-cdn.allizom.org",
-        "API_HOST": "https://addons-dev.allizom.org",
+        "PROXY_API_HOST": "https://addons-dev.allizom.org",
+        "FXA_CONFIG": "local",
         "CSP": false,
         "NODE_APP_INSTANCE": "amo"
       }
@@ -66,10 +67,11 @@
       }
     },
     "amo:stage": {
-      "command": "better-npm-run start-dev",
+      "command": "better-npm-run start-dev-proxy",
       "env": {
         "AMO_CDN": "https://addons-stage-cdn.allizom.org",
-        "API_HOST": "https://addons.allizom.org",
+        "PROXY_API_HOST": "https://addons.allizom.org",
+        "FXA_CONFIG": "local",
         "CSP": false,
         "NODE_APP_INSTANCE": "amo"
       }