diff --git a/docker-compose-watchers.yml b/docker-compose-watchers.yml
index 0a9da2a88c..2b8954afb7 100644
--- a/docker-compose-watchers.yml
+++ b/docker-compose-watchers.yml
@@ -5,7 +5,7 @@ services:
     command: bash -c 'cd /edx/app/edxapp/edx-platform && source ../edxapp_env && while true; do paver watch_assets --w=$$ASSET_WATCHER_TIMEOUT; sleep 2; done'
     container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.lms_watcher"
     environment:
-      BOK_CHOY_HOSTNAME: edx.devstack.lms_watcher
+      FRONTEND_TEST_SERVER_HOSTNAME: edx.devstack.lms_watcher
       ASSET_WATCHER_TIMEOUT: 12
     image: openedx/lms-dev:${OPENEDX_RELEASE:-latest}
     volumes:
@@ -23,7 +23,7 @@ services:
     command: bash -c 'cd /edx/app/edxapp/edx-platform && source ../edxapp_env && while true; do paver watch_assets --w=$$ASSET_WATCHER_TIMEOUT; sleep 2; done'
     container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.cms_watcher"
     environment:
-      BOK_CHOY_HOSTNAME: edx.devstack.cms_watcher
+      FRONTEND_TEST_SERVER_HOSTNAME: edx.devstack.cms_watcher
       ASSET_WATCHER_TIMEOUT: 12
     image: openedx/lms-dev:${OPENEDX_RELEASE:-latest}
     volumes:
diff --git a/docker-compose.yml b/docker-compose.yml
index f4511cff8b..1a68acd627 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -422,9 +422,9 @@ services:
     stdin_open: true
     tty: true
     environment:
-      BOK_CHOY_HOSTNAME: edx.devstack.lms
-      BOK_CHOY_LMS_PORT: 18003
-      BOK_CHOY_CMS_PORT: 18031
+      FRONTEND_TEST_SERVER_HOSTNAME: edx.devstack.lms
+      FRONTEND_TEST_SERVER_LMS_PORT: 18003
+      FRONTEND_TEST_SERVER_CMS_PORT: 18031
       EDXAPP_TEST_MONGO_HOST: edx.devstack.mongo
       NO_PYTHON_UNINSTALL: 1
       DJANGO_WATCHMAN_TIMEOUT: 30
@@ -599,9 +599,9 @@ services:
     stdin_open: true
     tty: true
     environment:
-      BOK_CHOY_HOSTNAME: edx.devstack.cms
-      BOK_CHOY_LMS_PORT: 18103
-      BOK_CHOY_CMS_PORT: 18131
+      FRONTEND_TEST_SERVER_HOSTNAME: edx.devstack.cms
+      FRONTEND_TEST_SERVER_LMS_PORT: 18103
+      FRONTEND_TEST_SERVER_CMS_PORT: 18131
       EDXAPP_TEST_MONGO_HOST: edx.devstack.mongo
       VIRTUAL_ENV: "/edx/app/edxapp/venvs/edxapp"
       PATH: "/edx/app/edxapp/venvs/edxapp/bin:/edx/app/edxapp/nodeenv/bin:/edx/app/edxapp/edx-platform/node_modules/.bin:/edx/app/edxapp/edx-platform/bin:${PATH}"