diff --git a/cms/envs/aws.py b/cms/envs/aws.py
index e7e32043d8..35827bfac5 100644
--- a/cms/envs/aws.py
+++ b/cms/envs/aws.py
@@ -214,14 +214,14 @@ with open(CONFIG_ROOT / CONFIG_PREFIX + "auth.json") as auth_file:
     AUTH_TOKENS = json.load(auth_file)
 
 ############### XBlock filesystem field config ##########
-if 'XBLOCK-FS-STORAGE-BUCKET' in ENV_TOKENS:
+if 'XBLOCK_FS_STORAGE_BUCKET' in ENV_TOKENS:
     DJFS = {
         'type' : 's3fs',
-        'bucket' : ENV_TOKENS.get('XBLOCK-FS-STORAGE-BUCKET', None),
-        'prefix' : ENV_TOKENS.get('XBLOCK-FS-STORAGE-PREFIX', '/xblock-storage/')
+        'bucket' : ENV_TOKENS.get('XBLOCK_FS_STORAGE_BUCKET', None),
+        'prefix' : ENV_TOKENS.get('XBLOCK_FS_STORAGE_PREFIX', '/xblock-storage/'),
+        'aws_access_key_id' : AUTH_TOKENS.get('AWS_ACCESS_KEY_ID', None),
+        'aws_secret_access_key' : AUTH_TOKENS.get('AWS_SECRET_ACCESS_KEY', None)
     }
-    DJFS['aws_access_key_id'] = AUTH_TOKENS.get('AWS_ACCESS_KEY_ID', None)
-    DJFS['aws_secret_access_key'] = AUTH_TOKENS.get('AWS_SECRET_ACCESS_KEY', None)
 
 EMAIL_HOST_USER = AUTH_TOKENS.get('EMAIL_HOST_USER', EMAIL_HOST_USER)
 EMAIL_HOST_PASSWORD = AUTH_TOKENS.get('EMAIL_HOST_PASSWORD', EMAIL_HOST_PASSWORD)
diff --git a/lms/envs/aws.py b/lms/envs/aws.py
index 3f656ef97c..a252ad019e 100644
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -299,14 +299,14 @@ with open(CONFIG_ROOT / CONFIG_PREFIX + "auth.json") as auth_file:
     AUTH_TOKENS = json.load(auth_file)
 
 ############### XBlock filesystem field config ##########
-if 'XBLOCK-FS-STORAGE-BUCKET' in ENV_TOKENS:
+if 'XBLOCK_FS_STORAGE_BUCKET' in ENV_TOKENS:
     DJFS = {
         'type' : 's3fs',
-        'bucket' : ENV_TOKENS.get('XBLOCK-FS-STORAGE-BUCKET', None),
-        'prefix' : ENV_TOKENS.get('XBLOCK-FS-STORAGE-PREFIX', '/xblock-storage/')
+        'bucket' : ENV_TOKENS.get('XBLOCK_FS_STORAGE_BUCKET', None),
+        'prefix' : ENV_TOKENS.get('XBLOCK_FS_STORAGE_PREFIX', '/xblock-storage/'),
+        'aws_access_key_id' : AUTH_TOKENS.get('AWS_ACCESS_KEY_ID', None),
+        'aws_secret_access_key' : AUTH_TOKENS.get('AWS_SECRET_ACCESS_KEY', None)
     }
-    DJFS['aws_access_key_id'] = AUTH_TOKENS.get('AWS_ACCESS_KEY_ID', None)
-    DJFS['aws_secret_access_key'] = AUTH_TOKENS.get('AWS_SECRET_ACCESS_KEY', None)
 
 ############### Module Store Items ##########
 HOSTNAME_MODULESTORE_DEFAULT_MAPPINGS = ENV_TOKENS.get('HOSTNAME_MODULESTORE_DEFAULT_MAPPINGS', {})