diff --git a/openvidu-server/docker/openvidu-server/Dockerfile b/openvidu-server/docker/openvidu-server/Dockerfile
index de348b25..1c07a8f8 100644
--- a/openvidu-server/docker/openvidu-server/Dockerfile
+++ b/openvidu-server/docker/openvidu-server/Dockerfile
@@ -4,11 +4,16 @@ MAINTAINER openvidu@gmail.com
 # Install Java
 RUN apt-get update && apt-get install -y openjdk-8-jdk && rm -rf /var/lib/apt/lists/*
 
-# Install OpenVidu Server
-COPY openvidu-server.jar openvidu-server.jar
+# Configure Supervisor
+RUN mkdir -p /var/log/supervisor
+COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+RUN apt-get update && apt-get install -y supervisor && rm -rf /var/lib/apt/lists/*
+
+# Copy OpenVidu Server
+COPY openvidu-server.jar /
 
 EXPOSE 8443
 EXPOSE 8888
 
 # Exec supervisord
-CMD java -jar /openvidu-server.jar
+CMD ["/usr/bin/supervisord"]
diff --git a/openvidu-server/docker/openvidu-server/supervisord.conf b/openvidu-server/docker/openvidu-server/supervisord.conf
new file mode 100644
index 00000000..37dbf9fe
--- /dev/null
+++ b/openvidu-server/docker/openvidu-server/supervisord.conf
@@ -0,0 +1,9 @@
+[supervisord]
+nodaemon=true
+logfile=/var/log/supervisor/supervisord.log;
+pidfile=/var/run/supervisord.pid;
+loglevel=debug
+
+[program:openvidu-server]
+command=/bin/bash -c "java -jar /openvidu-server.jar"
+redirect_stderr=true