diff --git a/dockerfile/Dockerfile b/dockerfile/Dockerfile
index 58ad226286b47f696afec72ca455390dbb80fdf0..339f64e3c0bebc56496d53d48273af5f08705d30 100644
--- a/dockerfile/Dockerfile
+++ b/dockerfile/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:trusty
+FROM debian:jessie
 
 LABEL Description=DaCHS\ is\ a\ publishing\ infrastructure\ for\ the\ Virtual\ Observatory. \
       Author=Markus\ Demleitner \
@@ -7,26 +7,34 @@ LABEL Description=DaCHS\ is\ a\ publishing\ infrastructure\ for\ the\ Virtual\ O
 
 MAINTAINER "Carlos Brandt <carloshenriquebrandt at gmail>"
 
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_CTYPE C.UTF-8
-
-RUN locale-gen --purge $LANG && \
-    echo LANG="$LANG" > /etc/default/locale && \
-    echo LANGUAGE="$LANGUAGE" >> /etc/default/locale && \
-    echo LC_CTYPE="$LC_CTYPE" >> /etc/default/locale
-
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update && \
-    apt-get install -y sudo wget vim && \
+    apt-get install -y sudo wget vim locales && \
     apt-get clean
 
+# This is the brute-force solution for Debian;
+# I am having problems in set locales non-interactively,
+# and since I really need the "C/UTF8" for postgres, will just set it for all.
+ENV LC_ALL C.UTF-8
+RUN echo LC_ALL="$LC_ALL" > /etc/default/locale
+
+# I'll leave the lines below for further look;
+# These work just find under Ubuntu.
+# (Yeah, I'll remove these lines in the near future...probably...)
+#ENV LANG en_US.UTF-8
+#ENV LANGUAGE en_US:en
+#ENV LC_CTYPE C.UTF-8
+#RUN locale-gen --purge $LANG && \
+#    echo LANG="$LANG" > /etc/default/locale && \
+#    echo LANGUAGE="$LANGUAGE" >> /etc/default/locale && \
+#    echo LC_CTYPE="$LC_CTYPE" >> /etc/default/locale
+
 RUN echo 'deb http://vo.ari.uni-heidelberg.de/debian stable main' > /etc/apt/sources.list.d/gavo.list && \
     echo 'deb-src 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 echo 'deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main' > /etc/apt/sources.list.d/pgdg.list && \
+RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main' > /etc/apt/sources.list.d/pgdg.list && \
     wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
 
 RUN sed -i 's/exit 101/exit 0/' /usr/sbin/policy-rc.d