diff --git a/opentech/settings/base.py b/opentech/settings/base.py
index 295a63b3036e016f95dee25552e67ab975779a7e..a0d7b706963fa1c6754bb399690b3e751c1de7ab 100644
--- a/opentech/settings/base.py
+++ b/opentech/settings/base.py
@@ -381,6 +381,8 @@ else:
 if 'AWS_STORAGE_BUCKET_NAME' in env:
     DEFAULT_FILE_STORAGE = 'storages.backends.s3boto3.S3Boto3Storage'
     AWS_STORAGE_BUCKET_NAME = env['AWS_STORAGE_BUCKET_NAME']
+    AWS_SECRET_ACCESS_KEY = env['AWS_SECRET_ACCESS_KEY'],
+    AWS_ACCESS_KEY_ID = env['AWS_ACCESS_KEY_ID'],
     AWS_QUERYSTRING_AUTH = False
     AWS_S3_FILE_OVERWRITE = False
 
@@ -401,8 +403,6 @@ if 'AWS_STORAGE_BUCKET_NAME' in env:
         # Uses defaults from above if not provided
         APPLY_STORAGE_CONFIG = {
             'AWS_STORAGE_BUCKET_NAME': env['APPLY_AWS_BUCKET_NAME'],
-            'AWS_S3_SECRET_ACCESS_KEY': env['AWS_S3_SECRET_ACCESS_KEY'],
-            'AWS_S3_ACCESS_KEY_ID': env['AWS_S3_ACCESS_KEY_ID'],
             'AWS_QUERYSTRING_AUTH': True,
             'AWS_DEFAULT_ACL': 'private',
             'AWS_BUCKET_ACL': 'private',