diff --git a/docker/openvidu-demo-proxy/conf/default.conf b/docker/openvidu-demo-proxy/conf/default.conf
index ff97bb93..1522062f 100644
--- a/docker/openvidu-demo-proxy/conf/default.conf
+++ b/docker/openvidu-demo-proxy/conf/default.conf
@@ -1,3 +1,7 @@
+add_header X-Frame-Options SAMEORIGIN;
+add_header X-Content-Type-Options nosniff;
+add_header X-XSS-Protection "1; mode=block";
+
 upstream openvidu-basic-videoconference {
     server url_ov_basic_videoconference;
 }
@@ -24,6 +28,19 @@ server {
 
     root /var/www/html;
 
+    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 $scheme;
+    proxy_set_header X-Forwarded-Proto https;
+    proxy_headers_hash_bucket_size 512;
+    proxy_redirect off;
+
+    # Websockets
+    proxy_http_version 1.1;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "upgrade";
+    
     location /basic-videoconference {
         rewrite /basic-videoconference(.*) /$1 break;
         proxy_pass http://openvidu-basic-videoconference;
@@ -45,6 +62,7 @@ server {
     }
 
     location /openvidu-call {
-        proxy_pass http://openvidu-call;
+        rewrite /openvidu-call(.*) $1 break;
+        proxy_pass http://openvidu-call;   
     }
 }
diff --git a/docker/openvidu-demos-docker-compose/docker-compose.yml b/docker/openvidu-demos-docker-compose/docker-compose.yml
index d3cac193..525d58e7 100644
--- a/docker/openvidu-demos-docker-compose/docker-compose.yml
+++ b/docker/openvidu-demos-docker-compose/docker-compose.yml
@@ -3,42 +3,42 @@ version: '3.1'
 services:
 
     openvidu-basic-videoconference:
-        image: openvidu/openvidu-basic-videoconference
+        image: openvidu/openvidu-basic-videoconference:2.13.0
         restart: on-failure
         environment: 
             - OPENVIDU_URL=https://${OPENVIDU_DOMAIN_OR_PUBLIC_IP:-}
             - OPENVIDU_SECRET=${OPENVIDU_SECRET:-}
     
     openvidu-basic-webinar:
-        image: openvidu/openvidu-basic-webinar
+        image: openvidu/openvidu-basic-webinar:2.13.0
         restart: on-failure
         environment: 
             - OPENVIDU_URL=https://${OPENVIDU_DOMAIN_OR_PUBLIC_IP:-}
             - OPENVIDU_SECRET=${OPENVIDU_SECRET:-}
 
     openvidu-classroom:
-        image: openvidu/openvidu-classroom
+        image: openvidu/openvidu-classroom:2.13.0
         restart: on-failure
         environment: 
             - OPENVIDU_URL=https://${OPENVIDU_DOMAIN_OR_PUBLIC_IP:-}
             - OPENVIDU_SECRET=${OPENVIDU_SECRET:-}
     
     openvidu-getaroom:
-        image: openvidu/openvidu-getaroom
+        image: openvidu/openvidu-getaroom:2.13.0
         restart: on-failure
         environment: 
             - OPENVIDU_URL=https://${OPENVIDU_DOMAIN_OR_PUBLIC_IP:-}
             - OPENVIDU_SECRET=${OPENVIDU_SECRET:-}
 
     openvidu-call:
-        image: openvidu/openvidu-call:2.12.0
+        image: openvidu/openvidu-call:2.12.0-demos
         restart: on-failure
         environment: 
             - OPENVIDU_URL=https://${OPENVIDU_DOMAIN_OR_PUBLIC_IP:-}
             - OPENVIDU_SECRET=${OPENVIDU_SECRET:-}
 
-    nginx:
-        image: openvidu/openvidu-demo-proxy
+    demos-page:
+        image: openvidu/openvidu-demo-proxy:1.0.0
         restart: on-failure
         ports:
             - "5442:80"