diff --git a/.env.development.local b/.env.development.local
index 08d2bbb8..6558370b 100644
--- a/.env.development.local
+++ b/.env.development.local
@@ -1,7 +1,8 @@
+# For local development using a Platform API that can be accessed via the host machine's localhost
 NODE_ENV=development
-VUE_APP_API_URL=http://localhost:8082
+VUE_APP_API_URL=http://host.docker.internal:8082
 VUE_APP_API_MOCK=0
-VUE_APP_RECAPTCHA_SITE_KEY="6LeHzbMUAAAAABjNp0vILaWr5ZeYHmteF7rGuZNV" # todo replace with test key
+VUE_APP_RECAPTCHA_SITE_KEY="6LeHzbMUAAAAABjNp0vILaWr5ZeYHmteF7rGuZNV"
 VUE_APP_BUILD_FOR_DOCKER_IMAGE=0
-VUE_APP_CNAME_RECORD=sites-1.dyna.wbaas.localhost
-VUE_APP_SUBDOMAIN_SUFFIX=".wbaas.localhost"
+VUE_APP_CNAME_RECORD=sites-1.dyna.wbaas.dev
+VUE_APP_SUBDOMAIN_SUFFIX=".wbaas.dev"
diff --git a/.env.development.mock b/.env.development.mock
index a7f2dd73..f0fdb8c0 100644
--- a/.env.development.mock
+++ b/.env.development.mock
@@ -1,7 +1,8 @@
+# For local development using a mock Platform API
 NODE_ENV=development
 VUE_APP_API_URL=
 VUE_APP_API_MOCK=1
 VUE_APP_RECAPTCHA_SITE_KEY="6LeHzbMUAAAAABjNp0vILaWr5ZeYHmteF7rGuZNV"
 VUE_APP_BUILD_FOR_DOCKER_IMAGE=0
-VUE_APP_CNAME_RECORD=sites-1.dyna.wbaas.localhost
-VUE_APP_SUBDOMAIN_SUFFIX=".wbaas.localhost"
+VUE_APP_CNAME_RECORD=sites-1.dyna.wbaas.dev
+VUE_APP_SUBDOMAIN_SUFFIX=".wbaas.dev"
diff --git a/.env.development.prod b/.env.development.prod
index c67741d9..b85eeadf 100644
--- a/.env.development.prod
+++ b/.env.development.prod
@@ -1,7 +1,8 @@
+# For local development against the production Platform API
 NODE_ENV=development
 VUE_APP_API_URL="https://api.wikibase.cloud"
 VUE_APP_API_MOCK=0
 VUE_APP_RECAPTCHA_SITE_KEY="6LeHzbMUAAAAABjNp0vILaWr5ZeYHmteF7rGuZNV"
 VUE_APP_BUILD_FOR_DOCKER_IMAGE=0
-VUE_APP_CNAME_RECORD=sites-1.dyna.wbstack.com
+VUE_APP_CNAME_RECORD=sites-1.dyna.wikibase.cloud
 VUE_APP_SUBDOMAIN_SUFFIX=".wikibase.cloud"
diff --git a/.env.development.staging b/.env.development.staging
new file mode 100644
index 00000000..0aa00ff6
--- /dev/null
+++ b/.env.development.staging
@@ -0,0 +1,8 @@
+# For local development against the staging Platform API
+NODE_ENV=development
+VUE_APP_API_URL="https://api.wikibase.dev"
+VUE_APP_API_MOCK=0
+VUE_APP_RECAPTCHA_SITE_KEY="6LeHzbMUAAAAABjNp0vILaWr5ZeYHmteF7rGuZNV"
+VUE_APP_BUILD_FOR_DOCKER_IMAGE=0
+VUE_APP_CNAME_RECORD=sites-1.dyna.wikibase.dev
+VUE_APP_SUBDOMAIN_SUFFIX=".wikibase.dev"
diff --git a/.env.development.test b/.env.development.test
index 0b641226..7246f560 100644
--- a/.env.development.test
+++ b/.env.development.test
@@ -1,3 +1,4 @@
+# For running GitHub Actions tests using docker
 NODE_ENV=development
 VUE_APP_API_URL=http://host.docker.internal:8082
 VUE_APP_API_MOCK=0