diff --git a/cms/envs/devstack-experimental.yml b/cms/envs/devstack-experimental.yml
index 61a94c4bc5..969e932937 100644
--- a/cms/envs/devstack-experimental.yml
+++ b/cms/envs/devstack-experimental.yml
@@ -512,7 +512,7 @@ VIDEO_IMAGE_MAX_AGE: 31536000
 VIDEO_IMAGE_SETTINGS:
     DIRECTORY_PREFIX: video-images/
     STORAGE_KWARGS:
-        location: /edx/var/edxapp/media//
+        location: /edx/var/edxapp/media/
     VIDEO_IMAGE_MAX_BYTES: 2097152
     VIDEO_IMAGE_MIN_BYTES: 2048
     BASE_URL: /media/
@@ -520,7 +520,7 @@ VIDEO_TRANSCRIPTS_MAX_AGE: 31536000
 VIDEO_TRANSCRIPTS_SETTINGS:
     DIRECTORY_PREFIX: video-transcripts/
     STORAGE_KWARGS:
-        location: edx/var/edxapp/media//
+        location: /edx/var/edxapp/media/
     VIDEO_TRANSCRIPTS_MAX_BYTES: 3145728
     BASE_URL: /media/
 VIDEO_UPLOAD_PIPELINE:
diff --git a/cms/envs/devstack.py b/cms/envs/devstack.py
index 3364d42b97..61359d0611 100644
--- a/cms/envs/devstack.py
+++ b/cms/envs/devstack.py
@@ -145,11 +145,19 @@ FEATURES['LICENSING'] = True
 XBLOCK_SETTINGS.update({'VideoBlock': {'licensing_enabled': True}})
 
 ################################ SEARCH INDEX ################################
-FEATURES['ENABLE_COURSEWARE_INDEX'] = False
+FEATURES['ENABLE_COURSEWARE_INDEX'] = True
 FEATURES['ENABLE_LIBRARY_INDEX'] = False
 FEATURES['ENABLE_CONTENT_LIBRARY_INDEX'] = False
 SEARCH_ENGINE = "search.elastic.ElasticSearchEngine"
 
+ELASTIC_SEARCH_CONFIG = [
+    {
+        'use_ssl': False,
+        'host': 'edx.devstack.elasticsearch710',
+        'port': 9200
+    }
+]
+
 ################################ COURSE DISCUSSIONS ###########################
 FEATURES['ENABLE_DISCUSSION_SERVICE'] = True
 
diff --git a/lms/envs/devstack-experimental.yml b/lms/envs/devstack-experimental.yml
index 17dadd7e1a..5ab37724ae 100644
--- a/lms/envs/devstack-experimental.yml
+++ b/lms/envs/devstack-experimental.yml
@@ -614,7 +614,7 @@ VIDEO_IMAGE_MAX_AGE: 31536000
 VIDEO_IMAGE_SETTINGS:
     DIRECTORY_PREFIX: video-images/
     STORAGE_KWARGS:
-        location: edx/var/edxapp/media//
+        location: /edx/var/edxapp/media/
     VIDEO_IMAGE_MAX_BYTES: 2097152
     VIDEO_IMAGE_MIN_BYTES: 2048
     BASE_URL: /media/
@@ -622,7 +622,7 @@ VIDEO_TRANSCRIPTS_MAX_AGE: 31536000
 VIDEO_TRANSCRIPTS_SETTINGS:
     DIRECTORY_PREFIX: video-transcripts/
     STORAGE_KWARGS:
-        location: edx/var/edxapp/media//
+        location: /edx/var/edxapp/media/
     VIDEO_TRANSCRIPTS_MAX_BYTES: 3145728
     BASE_URL: /media/
 VIDEO_UPLOAD_PIPELINE:
diff --git a/lms/envs/devstack.py b/lms/envs/devstack.py
index 6e4498a200..4eae239aab 100644
--- a/lms/envs/devstack.py
+++ b/lms/envs/devstack.py
@@ -165,10 +165,17 @@ FEATURES['LICENSING'] = True
 
 
 ########################## Courseware Search #######################
-FEATURES['ENABLE_COURSEWARE_SEARCH'] = False
+FEATURES['ENABLE_COURSEWARE_SEARCH'] = True
 FEATURES['ENABLE_COURSEWARE_SEARCH_FOR_COURSE_STAFF'] = True
 SEARCH_ENGINE = 'search.elastic.ElasticSearchEngine'
 
+ELASTIC_SEARCH_CONFIG = [
+    {
+        'use_ssl': False,
+        'host': 'edx.devstack.elasticsearch710',
+        'port': 9200
+    }
+]
 
 ########################## Dashboard Search #######################
 FEATURES['ENABLE_DASHBOARD_SEARCH'] = False