diff --git a/etc/apache2/vhost.conf.in b/etc/apache2/vhost.conf.in
index 5ab2d8a4..d860998a 100644
--- a/etc/apache2/vhost.conf.in
+++ b/etc/apache2/vhost.conf.in
@@ -23,7 +23,6 @@
     ProxyPass /static !
     ProxyPass /favicon.ico !
     ProxyPass /robots.txt !
-    ProxyPass /admin/media !
     ProxyPass /data !
     ProxyPass /.bzr !
 
@@ -32,7 +31,6 @@
     Alias /static      __PREFIX__/static
     Alias /favicon.ico __PREFIX__/static/favicon.ico
     Alias /data       __PREFIX__/data
-    Alias /static/admin __PREFIX__/django/django/contrib/admin
 
     ProxyPreserveHost On
     ProxyPass        / http://127.0.0.1:2620/
diff --git a/etc/nginx/vhost.in b/etc/nginx/vhost.in
index 058dd887..e653263e 100644
--- a/etc/nginx/vhost.in
+++ b/etc/nginx/vhost.in
@@ -24,10 +24,6 @@ server {
         root   __PREFIX__/static;
     }
 
-    location /static/admin/ {
-        root __PREFIX__/django/django/contrib/admin;
-        autoindex on;
-    }
     location /static/ {
         root   __PREFIX__;
         autoindex on;
diff --git a/vm/firstboot.sh b/vm/firstboot.sh
index 00b7a8a1..78ce93cf 100755
--- a/vm/firstboot.sh
+++ b/vm/firstboot.sh
@@ -54,6 +54,7 @@ echo "UPDATE django_site SET domain = '$HOST.local', name = '$HOST.local' WHERE
 mkdir /srv/pandora/data
 chown -R pandora:pandora /srv/pandora
 sudo -u pandora python manage.py update_static
+sudo -u pandora python manage.py collectstatic -l --noinput
 
 cp /srv/pandora/etc/init/* /etc/init/