diff --git a/api/config/settings/common.py b/api/config/settings/common.py
index 5c55dfdc164fee32b469a1b3ce2c2ccb514979a0..93381c4f5399425e340961bbde35500884df88bc 100644
--- a/api/config/settings/common.py
+++ b/api/config/settings/common.py
@@ -199,7 +199,7 @@ CRISPY_TEMPLATE_PACK = 'bootstrap3'
 STATIC_ROOT = str(ROOT_DIR('staticfiles'))
 
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#static-url
-STATIC_URL = env("STATIC_URL", default='/static/')
+STATIC_URL = env("STATIC_URL", default='/staticfiles/')
 
 # See: https://docs.djangoproject.com/en/dev/ref/contrib/staticfiles/#std:setting-STATICFILES_DIRS
 STATICFILES_DIRS = (
diff --git a/deploy/env.prod.sample b/deploy/env.prod.sample
index 38d355cb19d91868ed472fb9333e7e73359db66d..fd3b4327f7415ce2f18fa2a21fde4e30de73ca54 100644
--- a/deploy/env.prod.sample
+++ b/deploy/env.prod.sample
@@ -30,7 +30,7 @@ DJANGO_SETTINGS_MODULE=config.settings.production
 DJANGO_SECRET_KEY=
 
 # You don't have to edit this
-DJANGO_ADMIN_URL=^admin/
+DJANGO_ADMIN_URL=^api/admin/
 
 # Update it to match the domain that will be used to reach your funkwhale
 # instance
diff --git a/deploy/nginx.conf b/deploy/nginx.conf
index 32fe193f557e6602e92ea7b16d742f2626f4f556..d87413543e2b83216a9ad564de540a6b69a4b6aa 100644
--- a/deploy/nginx.conf
+++ b/deploy/nginx.conf
@@ -20,7 +20,7 @@ server {
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto https;
+        proxy_set_header X-Forwarded-Proto $scheme;
         proxy_redirect off;
         proxy_pass   http://funkwhale-api/api/;
     }
@@ -28,6 +28,6 @@ server {
         alias /srv/funkwhale/data/media/;
     }
     location /staticfiles/ {
-        alias /srv/funkwhale/data/staticfiles/;
+        alias /srv/funkwhale/data/static/;
     }
 }