diff --git a/Dockerfile b/Dockerfile
index de8cd8ad..7d81942d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,11 +3,6 @@
 FROM debian:9.6-slim
 LABEL author=frappé
 
-# Set locale C.UTF-8 for mariadb and general locale data
-ENV PYTHONIOENCODING=utf-8
-ENV LANGUAGE=en_US.UTF-8
-ENV LANG=en_US.UTF-8
-ENV LC_ALL=en_US.UTF-8
 
 # Install all neccesary packages
 RUN apt-get update && apt-get install -y --no-install-suggests --no-install-recommends build-essential cron curl git locales \
@@ -15,15 +10,18 @@ RUN apt-get update && apt-get install -y --no-install-suggests --no-install-reco
   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 \
   && npm install -g yarn
 
+# Set locale en_us.UTF-8 for mariadb and general locale data
+ENV PYTHONIOENCODING=utf-8
+ENV LANGUAGE=en_US.UTF-8
+ENV LANG=en_US.UTF-8
+ENV LC_ALL=en_US.UTF-8
+RUN locale-gen en_US.UTF-8
+
 # Add frappe user and setup sudo
 RUN groupadd -g 500 frappe \
   && useradd -ms /bin/bash -u 500 -g 500 -G sudo frappe \