diff --git a/Dockerfile b/latest/Dockerfile
similarity index 100%
rename from Dockerfile
rename to latest/Dockerfile
diff --git a/stretch/Dockerfile b/stretch/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..9b6fdf1e89b1a1071fc3bd13e830c19dfc9a0404
--- /dev/null
+++ b/stretch/Dockerfile
@@ -0,0 +1,14 @@
+FROM debian:stretch
+
+MAINTAINER Pavel Vondruska <vondruska@cesnet.cz>
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends fakeroot libx11-6 \
+    && rm -r /var/lib/apt/lists/* \
+    && apt-get clean
+
+RUN mkdir /afs /packages /auto /storage /scratch
+
+RUN ln -sf /afs/ics.muni.cz/software /software
+
+CMD ["bash"]