diff --git a/Dockerfile b/Dockerfile
index 66a79f7e1ac8402520ea28a9c9d43ad0e9b77a30..f0cac6baade558f3c29df01e90f2ffd78a9af20b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,8 +11,10 @@ ENV DEBIAN_FRONTEND noninteractive
 ENV DEBIAN_PRIORITY critical
 ENV DEBCONF_NOWARNINGS yes
 
-# Default Environment
-ENV JAVA_ARGS "-Xmx512m"
+# Fix locale
+RUN locale-gen en_US.UTF-8
+echo "LANG=\"en_US.UTF-8\"" > /etc/default/locale
+echo "LANGUAGE=\"en_US:en\"" >> /etc/default/locale
 
 # Install Jenkins
 RUN echo "deb http://pkg.jenkins-ci.org/debian binary/" > /etc/apt/sources.list.d/jenkins.list
@@ -20,14 +22,12 @@ RUN curl http://pkg.jenkins-ci.org/debian/jenkins-ci.org.key | apt-key add -
 RUN apt-get update
 RUN apt-get -y install jenkins
 
-# Fix locale
-RUN locale-gen en_US.UTF-8
-
 # Add startup script and SSH config
 ADD ssh /etc/ssh/jenkins
 ADD init.sh /init.sh
 
 # Start Jenkins
+ENV JAVA_ARGS "-Xmx512m"
 EXPOSE 8080 8081
 VOLUME ["/var/lib/jenkins"]
 CMD ["/bin/bash", "/init.sh"]
\ No newline at end of file