diff --git a/Dockerfile b/Dockerfile
index 2b4dab9..f37807a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,9 +14,6 @@ RUN rsync -av "rsync://89.238.64.78/gentoo-portage/licenses/" "/usr/portage/lice
 RUN /bin/bash /post-upgrade.sh  && \ 
 	rm -rf /post-upgrade.sh
 
-# Regenerate all locales
-RUN locale-gen
-
 # Set environment variables.
 ENV HOME /root
 
diff --git a/script/post-upgrade.sh b/script/post-upgrade.sh
index 6499058..5ebe3c1 100644
--- a/script/post-upgrade.sh
+++ b/script/post-upgrade.sh
@@ -89,6 +89,10 @@ rm -rf /etc/ssh/*_key*
 # TODO: check if the issue persists with systemd 202.
 echo FONT=LatArCyrHeb-16 > /etc/vconsole.conf
 
+# Regenerating locales
+
+locale-gen
+
 # remove LDAP keys
 rm -f /etc/openldap/ssl/ldap.pem /etc/openldap/ssl/ldap.key \
 /etc/openldap/ssl/ldap.csr /etc/openldap/ssl/ldap.crt