diff --git a/Dockerfile b/Dockerfile
index bf1713c6..38194713 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,6 +3,11 @@
 FROM debian:9.6-slim
 LABEL author=frappé
 
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-suggests --no-install-recommends locales \
+  && sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen \
+  && dpkg-reconfigure --frontend=noninteractive locales \
+  && apt-get clean && rm -rf /var/lib/apt/lists/*
+
 # Set locale en_us.UTF-8 for mariadb and general locale data
 ENV PYTHONIOENCODING=utf-8
 ENV LANGUAGE=en_US.UTF-8
@@ -10,16 +15,11 @@ ENV LANG=en_US.UTF-8
 ENV LC_ALL=en_US.UTF-8
 
 # Install all neccesary packages
-RUN export DEBIAN_FRONTEND=noninteractive && apt-get update \
-  && apt-get install -y --no-install-suggests --no-install-recommends build-essential cron curl git locales libffi-dev \
-  liblcms2-dev libldap2-dev libmariadbclient-dev libsasl2-dev libssl-dev libtiff5-dev libwebp-dev mariadb-client iputils-ping \
-  python-dev python-pip python-setuptools python-tk redis-tools rlwrap software-properties-common sudo tk8.6-dev vim \
-  xfonts-75dpi xfonts-base wget wkhtmltopdf \
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-suggests --no-install-recommends \
+  build-essential cron curl git libffi-dev liblcms2-dev libldap2-dev libmariadbclient-dev libsasl2-dev libssl-dev libtiff5-dev \
+  libwebp-dev mariadb-client iputils-ping python-dev python-pip python-setuptools python-tk redis-tools rlwrap \
+  software-properties-common sudo tk8.6-dev vim xfonts-75dpi xfonts-base wget wkhtmltopdf \
   && apt-get clean && rm -rf /var/lib/apt/lists/* \
-  && echo "LC_ALL=en_US.UTF-8" >> /etc/environment \
-  && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
-  && echo "LANG=en_US.UTF-8" > /etc/locale.conf \
-  && locale-gen en_US.UTF-8 \
   && curl https://deb.nodesource.com/node_10.x/pool/main/n/nodejs/nodejs_10.10.0-1nodesource1_amd64.deb > node.deb \
   && dpkg -i node.deb \
   && rm node.deb \