diff --git a/cms/envs/devstack_docker.py b/cms/envs/devstack_docker.py
index ae75d065ab..26721fd2a6 100644
--- a/cms/envs/devstack_docker.py
+++ b/cms/envs/devstack_docker.py
@@ -9,7 +9,10 @@ LOGGING['handlers']['local'] = LOGGING['handlers']['tracking'] = {
 
 LOGGING['loggers']['tracking']['handlers'] = ['console']
 
-LMS_ROOT_URL = 'http://edx.devstack.lms:18000'
+LMS_BASE = 'edx.devstack.lms:18000'
+CMS_BASE = 'edx.devstack.cms:18010'
+LMS_ROOT_URL = 'http://{}'.format(LMS_BASE)
+
 
 FEATURES.update({
     'ENABLE_COURSEWARE_INDEX': False,
diff --git a/lms/envs/devstack_docker.py b/lms/envs/devstack_docker.py
index e64f048438..ad3a4c0cfe 100644
--- a/lms/envs/devstack_docker.py
+++ b/lms/envs/devstack_docker.py
@@ -9,9 +9,10 @@ LOGGING['handlers']['local'] = LOGGING['handlers']['tracking'] = {
 
 LOGGING['loggers']['tracking']['handlers'] = ['console']
 
-HOST = 'edx.devstack.lms:18000'
-SITE_NAME = HOST
-LMS_ROOT_URL = 'http://{}'.format(HOST)
+LMS_BASE = 'edx.devstack.lms:18000'
+CMS_BASE = 'edx.devstack.cms:18010'
+SITE_NAME = LMS_BASE
+LMS_ROOT_URL = 'http://{}'.format(LMS_BASE)
 
 ECOMMERCE_PUBLIC_URL_ROOT = 'http://localhost:18130'
 ECOMMERCE_API_URL = 'http://edx.devstack.ecommerce:18130/api/v2'