diff --git a/docker/Dockerfile b/docker/Dockerfile
index 9cdfb7e..035bac8 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -26,6 +26,10 @@ RUN apt-get update -y ; \
 	apt-get clean ; \
 	rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
  
+## Generate UTF-8 locales
+RUN sed -i '/\.UTF-8/s/^# //g' /etc/locale.gen; \
+	locale-gen
+
 ## Add the Module user
 ARG UNAME
 ARG UHOME
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 6ff60a6..ace57db 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -34,7 +34,7 @@ set_locale()
 {
   ## Setup locale
   if [ "$DM_LC_ALL" ]; then
-    export LC_ALL="$DM_LC_ALL"
+    LC_ALL="$DM_LC_ALL"
     update-locale
   fi