diff --git a/openvidu-test-e2e/docker/bionic/Dockerfile b/openvidu-test-e2e/docker/Dockerfile
similarity index 65%
rename from openvidu-test-e2e/docker/bionic/Dockerfile
rename to openvidu-test-e2e/docker/Dockerfile
index ff77d1c5..b8b0c94e 100644
--- a/openvidu-test-e2e/docker/bionic/Dockerfile
+++ b/openvidu-test-e2e/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 LABEL maintainer="info@openvidu.io"
 
@@ -8,13 +8,6 @@ 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/6.16.0 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
-RUN sed -i "s/DAEMON_USER=\"kurento\"/DAEMON_USER=\"root\"/g" /etc/default/kurento-media-server
-
 # Install Node
 RUN apt-get update && apt-get install -y curl
 RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - && apt-get install -y nodejs
@@ -35,8 +28,6 @@ RUN npm install -g http-server@latest
 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
 
 # docker
diff --git a/openvidu-test-e2e/docker/create_image_bionic.sh b/openvidu-test-e2e/docker/create_image.sh
similarity index 67%
rename from openvidu-test-e2e/docker/create_image_bionic.sh
rename to openvidu-test-e2e/docker/create_image.sh
index 3899c6be..fea99a07 100755
--- a/openvidu-test-e2e/docker/create_image_bionic.sh
+++ b/openvidu-test-e2e/docker/create_image.sh
@@ -1 +1 @@
-docker build --rm --pull --no-cache -t openvidu/openvidu-test-e2e:bionic -f bionic/Dockerfile .
\ No newline at end of file
+docker build --rm --pull --no-cache -t openvidu/openvidu-test-e2e:focal -f 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
deleted file mode 100755
index b3ccddcd..00000000
--- a/openvidu-test-e2e/docker/create_image_xenial.sh
+++ /dev/null
@@ -1 +0,0 @@
-docker build --rm --pull --no-cache -t openvidu/openvidu-test-e2e:xenial -f xenial/Dockerfile .
\ No newline at end of file
diff --git a/openvidu-test-e2e/docker/xenial/Dockerfile b/openvidu-test-e2e/docker/xenial/Dockerfile
deleted file mode 100644
index 433af8b2..00000000
--- a/openvidu-test-e2e/docker/xenial/Dockerfile
+++ /dev/null
@@ -1,61 +0,0 @@
-FROM ubuntu:16.04
-
-LABEL maintainer="info@openvidu.io"
-
-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/6.16.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
-RUN sed -i "s/DAEMON_USER=\"kurento\"/DAEMON_USER=\"root\"/g" /etc/default/kurento-media-server
-
-# Install Node
-RUN apt-get update && apt-get install -y curl
-RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - && apt-get install -y nodejs
-
-# 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
-
-# docker
-RUN apt-get update && apt-get -y install docker.io
-
-# Java 11
-RUN add-apt-repository ppa:openjdk-r/ppa && \
-	apt-get update && \
-	apt-get install -y openjdk-11-jdk-headless
-
-# This is a fix: JDK 11 in Ubuntu 16.04 misses Java certs
-RUN wget https://download.java.net/openjdk/jdk8u41/ri/openjdk-8u41-b04-linux-x64-14_jan_2020.tar.gz -P /tmp/jdk8
-RUN	tar -zxvf /tmp/jdk8/openjdk-*.tar.gz -C /tmp/jdk8 --strip-components=1 && \
-	cp /tmp/jdk8/jre/lib/security/cacerts /etc/ssl/certs/java && \
-	update-ca-certificates -f && \
-	rm -rf /tmp/jdk8
-
-# Maven
-RUN apt-get install -y maven
-
-# Cleanup
-RUN rm -rf /var/lib/apt/lists/*
-RUN apt-get autoremove --purge -y && apt-get autoclean
-
-COPY entrypoint.sh /entrypoint.sh
-RUN ["chmod", "+x", "/entrypoint.sh"]
-
-ENTRYPOINT ["/entrypoint.sh"]