diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/env.d/02locale b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/env.d/02locale
index 7e0033645..4ffa5afa0 100644
--- a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/env.d/02locale
+++ b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/env.d/02locale
@@ -1,13 +1,3 @@
 # Calculate format=openrc protected
-
-# CLDC, gedit - bg_BG.UTF-8 causes the typing problem
-#?in(os_install_locale_locale, bg_BG.UTF-8, kk_KZ.UTF-8)!=#
-#?os_install_locale_locale==bg_BG.UTF-8#
-LANG="bg_BG.UTF-8"
-#!os_install_locale_locale#
-LANG="kk_KZ.UTF-8"
-#os_install_locale_locale#
-#!in#
-LANG="#-os_install_locale_locale-#"
-#in#
+LANG="#-os_install_locale_lang-#".UTF-8
 LC_NUMERIC=POSIX
diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/update-grub b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/update-grub
index 520311a3e..09b6d937b 100644
--- a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/update-grub
+++ b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/update-grub
@@ -36,7 +36,7 @@ grep_modules() {
 before_mods=( $(grep_modules) )
 
 #?ac_install_disk==on#
-LANG=#-install.os_install_locale_locale-# /bin/chroot #-cl_chroot_path-# grub-mkconfig -o /boot/grub/grub.cfg &>/dev/null
+LANG=#-install.os_install_locale_lang-#.UTF-8 /bin/chroot #-cl_chroot_path-# grub-mkconfig -o /boot/grub/grub.cfg &>/dev/null
 #!ac_install_disk#
 /usr/sbin/grub-mkconfig -o /boot/grub/grub.cfg &>/dev/null
 #ac_install_disk#
diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-libs/glibc/locale.gen b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-libs/glibc/locale.gen
index ed1e853bd..995a6c58e 100644
--- a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-libs/glibc/locale.gen
+++ b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-libs/glibc/locale.gen
@@ -1,6 +1,6 @@
 # Calculate comment=#
 
-#?os_install_locale_locale!=en_US.UTF-8#
+#?os_install_locale_lang!=en_US#
 en_US.UTF-8 UTF-8
-#os_install_locale_locale#
-#-os_install_locale_locale-# UTF-8
+#os_install_locale_lang#
+#-os_install_locale_lang-#.UTF-8 UTF-8