diff --git a/openvidu-server/docker/openvidu-server-kms/Dockerfile b/openvidu-server/docker/openvidu-server-kms/Dockerfile
index eeaab759..1db26cab 100644
--- a/openvidu-server/docker/openvidu-server-kms/Dockerfile
+++ b/openvidu-server/docker/openvidu-server-kms/Dockerfile
@@ -7,15 +7,16 @@ RUN echo "deb http://ubuntu.openvidu.io/6.7.0 xenial kms6" | tee /etc/apt/source
 	&& apt-get update \
 	&& apt-get -y dist-upgrade \
 	&& apt-get -y install kurento-media-server \
-	&& apt-get -y install openh264-gst-plugins-bad-1.5
+	&& apt-get -y install openh264-gst-plugins-bad-1.5 \
+	&& rm -rf /var/lib/apt/lists/*
 
 COPY kms.sh /kms.sh
 
 # Install Java
-RUN apt-get install -y openjdk-8-jdk
+RUN apt-get update && apt-get install -y openjdk-8-jdk && rm -rf /var/lib/apt/lists/*
 
 # Install supervisor
-RUN apt-get install -y supervisor && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y supervisor && rm -rf /var/lib/apt/lists/*
 
 # Configure supervisor
 RUN mkdir -p /var/log/supervisor
diff --git a/openvidu-server/docker/openvidu-server-kms/kms.sh b/openvidu-server/docker/openvidu-server-kms/kms.sh
index 47324bf1..204d963d 100644
--- a/openvidu-server/docker/openvidu-server-kms/kms.sh
+++ b/openvidu-server/docker/openvidu-server-kms/kms.sh
@@ -1,14 +1,15 @@
 #!/bin/bash -x
 set -e
 
-if [ -n "$KMS_TURN_URL" ]; then
-  echo "turnURL=$KMS_TURN_URL" > /etc/kurento/modules/kurento/WebRtcEndpoint.conf.ini
-fi
-
 if [ -n "$KMS_STUN_IP" -a -n "$KMS_STUN_PORT" ]; then
   # Generate WebRtcEndpoint configuration
   echo "stunServerAddress=$KMS_STUN_IP" > /etc/kurento/modules/kurento/WebRtcEndpoint.conf.ini
   echo "stunServerPort=$KMS_STUN_PORT" >> /etc/kurento/modules/kurento/WebRtcEndpoint.conf.ini
+  if [ -n "$KMS_TURN_URL" ]; then
+    echo "turnURL=$KMS_TURN_URL" >> /etc/kurento/modules/kurento/WebRtcEndpoint.conf.ini
+  fi
+elif [ -n "$KMS_TURN_URL" ]; then
+    echo "turnURL=$KMS_TURN_URL" > /etc/kurento/modules/kurento/WebRtcEndpoint.conf.ini
 fi
 
 # Remove ipv6 local loop until ipv6 is supported