diff --git a/openvidu-test-e2e/docker/bionic/Dockerfile b/openvidu-test-e2e/docker/bionic/Dockerfile
new file mode 100644
index 00000000..9a89e8e4
--- /dev/null
+++ b/openvidu-test-e2e/docker/bionic/Dockerfile
@@ -0,0 +1,49 @@
+FROM ubuntu:18.04
+
+LABEL maintainer="openvidu@gmail.com"
+
+USER root
+
+RUN apt-get update && apt-get -y upgrade 
+
+RUN apt-get install -y software-properties-common && apt-get install -y --no-install-recommends apt-utils
+
+# Install Kurento Media Server (KMS)
+RUN echo "deb [arch=amd64] http://ubuntu.openvidu.io/dev bionic kms6" | tee /etc/apt/sources.list.d/kurento.list \
+	&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 5AFA7A83 \
+	&& apt-get update \
+	&& apt-get -y install kurento-media-server
+
+# Install Node
+RUN apt-get update && apt-get install -y curl
+RUN curl -sL https://deb.nodesource.com/setup_8.x | bash - && apt-get install -y nodejs
+
+# Java
+RUN apt-get install -y default-jdk
+
+# Maven
+RUN apt-get install -y maven
+
+# git
+RUN apt-get install -y git
+
+# http-server
+RUN npm install -g http-server@latest
+
+# sudo
+RUN apt-get -y install sudo
+
+# ffmpeg (for ffprobe)
+RUN add-apt-repository ppa:jonathonf/ffmpeg-4
+RUN apt-get update
+RUN apt-get install -y ffmpeg
+
+# Cleanup
+RUN rm -rf /var/lib/apt/lists/*
+RUN apt-get autoremove --purge -y
+
+COPY barcode.y4m /opt/openvidu/barcode.y4m
+COPY entrypoint.sh /entrypoint.sh
+RUN ["chmod", "+x", "/entrypoint.sh"]
+
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/openvidu-test-e2e/docker/create_image_bionic.sh b/openvidu-test-e2e/docker/create_image_bionic.sh
new file mode 100755
index 00000000..b7f74ac8
--- /dev/null
+++ b/openvidu-test-e2e/docker/create_image_bionic.sh
@@ -0,0 +1 @@
+docker build -t openvidu/openvidu-test-e2e:bionic -f bionic/Dockerfile .
\ No newline at end of file
diff --git a/openvidu-test-e2e/docker/create_image_xenial.sh b/openvidu-test-e2e/docker/create_image_xenial.sh
new file mode 100755
index 00000000..bde4a8cf
--- /dev/null
+++ b/openvidu-test-e2e/docker/create_image_xenial.sh
@@ -0,0 +1 @@
+docker build -t openvidu/openvidu-test-e2e:xenial -f xenial/Dockerfile .
\ No newline at end of file
diff --git a/openvidu-test-e2e/docker/Dockerfile b/openvidu-test-e2e/docker/xenial/Dockerfile
similarity index 90%
rename from openvidu-test-e2e/docker/Dockerfile
rename to openvidu-test-e2e/docker/xenial/Dockerfile
index 5ae3c6b6..888c46c5 100644
--- a/openvidu-test-e2e/docker/Dockerfile
+++ b/openvidu-test-e2e/docker/xenial/Dockerfile
@@ -9,7 +9,7 @@ RUN apt-get update && apt-get -y upgrade
 RUN apt-get install -y software-properties-common && apt-get install -y --no-install-recommends apt-utils
 
 # Install Kurento Media Server (KMS)
-RUN echo "deb http://ubuntu.openvidu.io/6.9.0 xenial kms6" | tee /etc/apt/sources.list.d/kurento.list \
+RUN echo "deb [arch=amd64] http://ubuntu.openvidu.io/6.9.0 xenial kms6" | tee /etc/apt/sources.list.d/kurento.list \
 	&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 5AFA7A83 \
 	&& apt-get update \
 	&& apt-get -y install kurento-media-server