diff --git a/deployment/nginx.conf b/deployment/nginx.conf
index c6cecc78..69643afd 100644
--- a/deployment/nginx.conf
+++ b/deployment/nginx.conf
@@ -2,7 +2,7 @@ server {
     listen 8080;
     
     location /assets {
-    	     alias /app/static;
+    	     alias /app/assets;
 	     try_files $uri $uri/ =404;
     }
     
@@ -23,7 +23,7 @@ server {
     location /etherpad {
     	rewrite /etherpad/(.*) $1 break;
 	rewrite ^/etherpad$ /etherpad/ permanent;
-	proxy_pass http://etherpad:8080;
+	proxy_pass http://etherpad:9001;
 	proxy_redirect / /etherpad/;
 	proxy_set_header Host $host;
 	proxy_buffering off;