diff --git a/cms/envs/aws.py b/cms/envs/aws.py
index 965ff06610ce672a184501d7c1fb701c088be3bc..d5b652af061655c38b2d878cc5b81d34da2ea695 100644
--- a/cms/envs/aws.py
+++ b/cms/envs/aws.py
@@ -159,6 +159,7 @@ ALLOWED_HOSTS = [
 ]
 
 LOG_DIR = ENV_TOKENS['LOG_DIR']
+DATA_DIR = ENV_TOKENS.get('DATA_DIR', DATA_DIR)
 
 CACHES = ENV_TOKENS['CACHES']
 # Cache used for location mapping -- called many times with the same key/value
diff --git a/lms/envs/aws.py b/lms/envs/aws.py
index 8cc29f593ff659e4ae2d1f395806807bf376b095..0e501ddb22dcae1a11c09c7a949620561ced7047 100644
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -324,6 +324,7 @@ WIKI_ENABLED = ENV_TOKENS.get('WIKI_ENABLED', WIKI_ENABLED)
 
 local_loglevel = ENV_TOKENS.get('LOCAL_LOGLEVEL', 'INFO')
 LOG_DIR = ENV_TOKENS['LOG_DIR']
+DATA_DIR = ENV_TOKENS.get('DATA_DIR', DATA_DIR)
 
 LOGGING = get_logger_config(LOG_DIR,
                             logging_env=ENV_TOKENS['LOGGING_ENV'],