diff --git a/Dockerfile b/Dockerfile
index c9d4d25..0b6c77e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,9 +6,6 @@ MAINTAINER Stefan Verhoeven <s.verhoeven@esciencecenter.nl>
 
 # Configuring locales
 ENV DEBIAN_FRONTEND noninteractive
-RUN dpkg-reconfigure locales && \
-      locale-gen en_US.UTF-8 && \
-      update-locale LANG=en_US.UTF-8
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
@@ -93,9 +90,14 @@ RUN useradd -m -d /home/cartodb -s /bin/bash cartodb && \
     wget \
     nginx-light \
     net-tools \
+    locales \
   --no-install-recommends && \
   rm -rf /var/lib/apt/lists/*
 
+RUN dpkg-reconfigure locales && \
+      locale-gen en_US.UTF-8 && \
+      update-locale LANG=en_US.UTF-8
+
 RUN git config --global user.email you@example.com
 RUN git config --global user.name "Your Name"