diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py
index a76ab2cc66fe0e1c77b5bc4b9c6067772515be79..790749d81dade500b4773d8b4bc835a27f612a4e 100644
--- a/pinaxcon/settings.py
+++ b/pinaxcon/settings.py
@@ -121,14 +121,14 @@ USE_I18N = True
 USE_L10N = True
 USE_TZ = True
 
-MEDIA_ROOT = os.path.join(PACKAGE_ROOT, "site_media", "media")
+MEDIA_ROOT = os.environ.get("MEDIA_ROOT", os.path.join(PACKAGE_ROOT, "site_media", "media"))
 MEDIA_URL = "/site_media/media/"
 
-STATIC_ROOT = os.path.join(PROJECT_ROOT, 'static/build')
+STATIC_ROOT = os.path.join(PROJECT_ROOT, 'static', 'build')
 STATIC_URL = '/static/build/'
 
 STATICFILES_DIRS = [
-    os.path.join(PROJECT_ROOT, 'static/src'),
+    os.path.join(PROJECT_ROOT, 'static', 'src'),
 ]
 
 STATICFILES_FINDERS = [
@@ -421,7 +421,7 @@ SAML_CONFIG = {
 if 'SAML_CONFIG_LOADER' in os.environ:
     SAML_CONFIG_LOADER = os.environ.get('SAML_CONFIG_LOADER')
 
-DEFAULT_FILE_STORAGE = 'gapc_storage.storage.GoogleCloudStorage'
+DEFAULT_FILE_STORAGE = os.environ.get('DEFAULT_FILE_STORAGE', 'gapc_storage.storage.GoogleCloudStorage')
 GAPC_STORAGE = {
     'num_retries': 2,
 }