diff --git a/deployment/nginx.conf b/deployment/nginx.conf
index e2befeef..96aea066 100644
--- a/deployment/nginx.conf
+++ b/deployment/nginx.conf
@@ -1,9 +1,12 @@
 server {
     listen 8080;
+    error_log /var/log/nginx/error.log notice;
+    rewrite_log on;
+
     
     location /assets {
-    	     alias /app/assets;
-	     try_files $uri =404;
+             alias /app/assets;
+             try_files $uri =404;
     }
 
     location /files {
@@ -13,7 +16,7 @@ server {
     
     location /fotos {
         proxy_ssl_server_name on;
-	proxy_ssl_verify off;
+        proxy_ssl_verify off;
 
         proxy_pass http://flaskfetfotos:8080;
         proxy_http_version 1.1;
@@ -26,25 +29,34 @@ server {
     }
     
     location /etherpad {
-    	rewrite /etherpad/(.*) /$1 break;
-	rewrite ^/etherpad$ /etherpad/ permanent;
-	proxy_pass http://etherpad:9001;
-	proxy_redirect / /etherpad/;
-	proxy_set_header Host $host;
-	proxy_buffering off;
+        rewrite /etherpad/(.*) /$1 break;
+        rewrite ^/etherpad$ /etherpad/ permanent;
+        proxy_pass http://etherpad:9001;
+        proxy_redirect / /etherpad/;
+        proxy_set_header Host $host;
+        proxy_buffering off;
     }
-    
     location /dev {
-    	rewrite /dev/(.*) /$1 break;
-	rewrite ^/dev$ /dev/ permanent;
-	proxy_pass http://theia:3000;
-	#proxy_redirect / /etherpad/;
-	proxy_set_header Host $host;
-	proxy_buffering off;
-    }
+        rewrite_log on;
+        rewrite /dev/(.*) /$1 break;
+        rewrite ^/dev$ /dev/ permanent;
+        proxy_set_header Host $host;
+        proxy_set_header Proxy "";
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "Upgrade";
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarde-Proto $scheme;
+        
+        
+        proxy_buffering off;
+
+        proxy_pass http://theia:3000;
+        #proxy_redirect / /etherpad/;
+            }
     
     location / {
-    	include uwsgi_params;
+        include uwsgi_params;
         uwsgi_pass unix:///tmp/uwsgi.sock;
     }
 }