diff --git a/dockerfile/Dockerfile b/dockerfile/Dockerfile
index 5cedf5b9e23daa8360c79ccd47f93bb38d2542c5..97e0fec6d2653dab79e1148d4759e44385ed4fb4 100644
--- a/dockerfile/Dockerfile
+++ b/dockerfile/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:stretch
+FROM debian:jessie
 
 LABEL Description=DaCHS\ is\ a\ publishing\ infrastructure\ for\ the\ Virtual\ Observatory. \
       Author=Markus\ Demleitner \
@@ -7,21 +7,23 @@ LABEL Description=DaCHS\ is\ a\ publishing\ infrastructure\ for\ the\ Virtual\ O
 
 MAINTAINER "Carlos Brandt <carloshenriquebrandt at gmail>"
 
-RUN DEBIAN_FRONTEND='noninteractive'               && \
-    apt-get update                                 && \
-    apt-get install -y sudo wget vim locales git gnupg   && \
+RUN DEBIAN_FRONTEND='noninteractive'                    && \
+    apt-get update                                      && \
+    apt-get install -y sudo wget vim locales git gnupg  && \
     apt-get clean
 
-ENV LANG C.UTF-8
+ENV LANG=C.UTF-8
 RUN echo LANG="$LANG" > /etc/default/locale
 
-RUN echo 'deb http://vo.ari.uni-heidelberg.de/debian release main'  \
+ENV PG_VERSION=9.4
+
+RUN echo 'deb http://vo.ari.uni-heidelberg.de/debian stable main'   \
         > /etc/apt/sources.list.d/gavo.list                         && \
     wget -qO - http://docs.g-vo.org/archive-key.asc | apt-key add -
 
-RUN DEBIAN_FRONTEND='noninteractive'                        && \
-    apt-get update                                          && \
-    apt-get install -y python-gavodachs postgresql-9.6-q3c  && \
+RUN DEBIAN_FRONTEND='noninteractive'                                  && \
+    apt-get update                                                    && \
+    apt-get install -y python-gavodachs postgresql-${PG_VERSION}-q3c  && \
     apt-get clean
 
 ENV GAVO_ROOT="/var/gavo"                       \