diff --git a/bigbluebutton-web/docker-entrypoint.sh b/bigbluebutton-web/docker-entrypoint.sh
index 2c57dc634c..460ef6c519 100755
--- a/bigbluebutton-web/docker-entrypoint.sh
+++ b/bigbluebutton-web/docker-entrypoint.sh
@@ -11,7 +11,7 @@ mkdir -p /var/bigbluebutton/published
 mkdir -p /var/bigbluebutton/deleted
 mkdir -p /var/bigbluebutton/unpublished
 
-export JAVA_OPTS="${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -DsecuritySalt=${SHARED_SECRET} -Dredis.host=redis -Dbigbluebutton.web.serverURL=https://${SERVER_DOMAIN} -DattendeesJoinViaHTML5Client=true -DmoderatorsJoinViaHTML5Client=true -DsvgImagesRequired=true"
+export JAVA_OPTS="${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -DsecuritySalt=${SHARED_SECRET} -Dredis.host=redis -DredisHost=redis -Dbigbluebutton.web.serverURL=https://${SERVER_DOMAIN} -DattendeesJoinViaHTML5Client=true -DmoderatorsJoinViaHTML5Client=true -DsvgImagesRequired=true"
 sed -i "s|^securerandom\.source=.*|securerandom.source=file:/dev/urandom|g" ${JAVA_HOME}/lib/security/java.security
 
 catalina.sh run
diff --git a/labs/bbb-webrtc-sfu/config/custom-environment-variables.yml b/labs/bbb-webrtc-sfu/config/custom-environment-variables.yml
index 322efff11b..2f5678e207 100644
--- a/labs/bbb-webrtc-sfu/config/custom-environment-variables.yml
+++ b/labs/bbb-webrtc-sfu/config/custom-environment-variables.yml
@@ -1,3 +1,5 @@
 kurentoUrl: KURENTO_URL
 kurentoIp: KURENTO_IP
 redisHost: REDIS_HOST
+freeswitch:
+    ip: FREESWITCH_IP
diff --git a/labs/docker/README.md b/labs/docker/README.md
index efd26d8377..d04ce81c6f 100644
--- a/labs/docker/README.md
+++ b/labs/docker/README.md
@@ -148,7 +148,6 @@ $ docker run -d --rm --name nginx -v docker_static:/var/www/bigbluebutton-defaul
 $ docker cp . nginx:/var/www/bigbluebutton-default
 $ docker exec -it nginx chown -R www-data:www-data /var/www/bigbluebutton-default
 $ docker stop nginx
-
 ```
 
 ### Launch with docker-compose
diff --git a/labs/docker/docker-compose.yml b/labs/docker/docker-compose.yml
index 760a207d3a..44b3d809f1 100644
--- a/labs/docker/docker-compose.yml
+++ b/labs/docker/docker-compose.yml
@@ -17,7 +17,7 @@ services:
       - redis
     environment:
       MONGO_URL: mongodb://mongo/bbbhtml5
-      METEOR_SETTINGS_MODIFIER: ".public.kurento.wsUrl = \"wss://${SERVER_DOMAIN}/bbb-webrtc-sfu\" | .public.kurento.enableVideo = true | .public.kurento.enableScreensharing = true | .public.kurento.chromeDefaultExtensionKey = \"${SCREENSHARE_EXTENSION_KEY}\" | .public.kurento.chromeDefaultExtensionLink = \"${SCREENSHARE_EXTENSION_LINK}\""
+      METEOR_SETTINGS_MODIFIER: ".public.kurento.wsUrl = \"wss://${SERVER_DOMAIN}/bbb-webrtc-sfu\" | .public.kurento.enableVideo = true | .public.kurento.enableScreensharing = true | .public.kurento.chromeDefaultExtensionKey = \"${SCREENSHARE_EXTENSION_KEY}\" | .public.kurento.chromeDefaultExtensionLink = \"${SCREENSHARE_EXTENSION_LINK}\" | .public.kurento.enableVideoStats = true | .public.kurento.enableListenOnly = true"
       REDIS_HOST: redis
       ROOT_URL: http://127.0.0.1/html5client
 
@@ -35,6 +35,8 @@ services:
     restart: unless-stopped
     links:
       - coturn
+    volumes:
+      - media-audio:/var/freeswitch/meetings
 
   bbb-webrtc-sfu:
     image: ${TAG_PREFIX}bbb-webrtc-sfu${TAG_SUFFIX}
@@ -42,10 +44,12 @@ services:
     links:
       - redis
       - kurento
+      - bbb-freeswitch
     environment:
       KURENTO_IP: ${EXTERNAL_IP}
       KURENTO_URL: ws://kurento:8888/kurento
       REDIS_HOST: redis
+      FREESWITCH_IP: bbb-freeswitch
 
   coturn:
     image: ${TAG_PREFIX}coturn${TAG_SUFFIX}
@@ -70,6 +74,9 @@ services:
   kurento:
     image: ${TAG_PREFIX}kurento${TAG_SUFFIX}
     restart: unless-stopped
+    volumes:
+      - media-video:/var/kurento/recordings
+      - media-screenshare:/var/kurento/screenshare
     environment:
       KMS_STUN_IP: ${EXTERNAL_IP}
       KMS_STUN_PORT: 3478
@@ -139,7 +146,8 @@ services:
 
 volumes:
   ssl-conf:
-    driver: local    
   static:
-    driver: local    
   bigbluebutton:
+  media-audio:
+  media-video:
+  media-screenshare: