diff --git a/tools/docker/README.md b/tools/docker/README.md
index bdfadeef21..1fc352f521 100644
--- a/tools/docker/README.md
+++ b/tools/docker/README.md
@@ -8,7 +8,7 @@
 **Build container**
 
 * `cd ~/LibreELEC`
-* `docker build --pull -t libreelec tools/docker`
+* `docker build --pull -t libreelec tools/docker/xenial`
 
 **Build image inside container**
 
diff --git a/tools/docker/bionic/Dockerfile b/tools/docker/bionic/Dockerfile
new file mode 100644
index 0000000000..3800c2edc4
--- /dev/null
+++ b/tools/docker/bionic/Dockerfile
@@ -0,0 +1,32 @@
+FROM ubuntu:bionic
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update \
+ && apt-get dist-upgrade -y \
+ && apt-get install -y locales sudo \
+ && rm -rf /var/lib/apt/lists/*
+
+RUN locale-gen en_US.UTF-8 \
+ && update-locale LANG=en_US.UTF-8 LANGUAGE=en_US:en
+ENV LANG=en_US.UTF-8 \
+    LANGUAGE=en_US:en \
+    LC_ALL=en_US.UTF-8
+
+RUN adduser --disabled-password --gecos '' docker \
+ && adduser docker sudo \
+ && echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
+
+RUN apt-get update && apt-get install -y \
+    wget bash bc gcc sed patch patchutils tar bzip2 gzip perl gawk gperf zip unzip diffutils texinfo lzop python \
+    g++ xfonts-utils xfonts-utils xfonts-utils xsltproc default-jre-headless \
+    libc6-dev libncurses5-dev \
+    u-boot-tools \
+    xz-utils make file libxml-parser-perl \
+    libjson-perl \
+    golang-go \
+    git openssh-client \
+    --no-install-recommends \
+ && rm -rf /var/lib/apt/lists/*
+
+USER docker
diff --git a/tools/docker/stretch/Dockerfile b/tools/docker/stretch/Dockerfile
new file mode 100644
index 0000000000..a6d5dc9651
--- /dev/null
+++ b/tools/docker/stretch/Dockerfile
@@ -0,0 +1,33 @@
+FROM debian:stretch
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update \
+ && apt-get dist-upgrade -y \
+ && apt-get install -y locales sudo \
+ && rm -rf /var/lib/apt/lists/*
+
+RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen \
+ && locale-gen en_US.UTF-8 \
+ && update-locale LANG=en_US.UTF-8 LANGUAGE=en_US:en
+ENV LANG=en_US.UTF-8 \
+    LANGUAGE=en_US:en \
+    LC_ALL=en_US.UTF-8
+
+RUN adduser --disabled-password --gecos '' docker \
+ && adduser docker sudo \
+ && echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
+
+RUN apt-get update && apt-get install -y \
+    wget bash bc gcc sed patch patchutils tar bzip2 gzip perl gawk gperf zip unzip diffutils texinfo lzop python \
+    g++ xfonts-utils xfonts-utils xfonts-utils xsltproc default-jre-headless \
+    libc6-dev libncurses5-dev \
+    u-boot-tools \
+    xz-utils make file libxml-parser-perl \
+    libjson-perl \
+    golang-go \
+    git openssh-client \
+    --no-install-recommends \
+ && rm -rf /var/lib/apt/lists/*
+
+USER docker
diff --git a/tools/docker/Dockerfile b/tools/docker/xenial/Dockerfile
similarity index 100%
rename from tools/docker/Dockerfile
rename to tools/docker/xenial/Dockerfile