diff --git a/.gitignore b/.gitignore
index c8019cdc311750931c309c5f01b5c0ed8b78f8a5..b05c3a48f764c56a215282cdaac4bcf796faf08a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,7 @@ misc/pg.json
 env/
 
 # static files from `gms/manage.py collectstatic`
-gms/static
+media/
 
 # Logs
 logs
diff --git a/src/gms/settings.py b/src/gms/settings.py
index 27aec658323ac20aee3e26def72a2297cf1b1093..63a7f9dcbec63b0abf9a4cf65990c6b8e6988468 100644
--- a/src/gms/settings.py
+++ b/src/gms/settings.py
@@ -62,9 +62,11 @@ DATABASE_ROUTERS = ['import_members.db.MemberDbRouter']
 
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.7/howto/static-files/
-
+STATICFILES_DIRS = [
+    os.path.join(BASE_DIR, 'static'),
+]
 STATIC_URL = '/media/'
-STATIC_ROOT = os.path.join(BASE_DIR, 'static')
+STATIC_ROOT = os.path.join(ROOT_DIR, 'media')
 
 AUTHENTICATION_BACKENDS = [
     # see https://django-auth-ldap.readthedocs.io/en/latest for configuration info