diff --git a/roles/locale/defaults/main.yaml b/roles/locale/defaults/main.yaml
index ddbc529..73dec50 100644
--- a/roles/locale/defaults/main.yaml
+++ b/roles/locale/defaults/main.yaml
@@ -7,6 +7,8 @@ gen_locales:
   - en_US.UTF-8
   - en_GB.UTF-8
 
-lang: en_US.UTF-8
-lc_messages: "{{ lang }}"
-language: "en_US:en"
+locale_gen_locales: "{{ gen_locales }}"
+
+locale_lang: "{{ lang | default('en_US.UTF-8') }}"
+locale_lc_messages: "{{ locale_lang }}"
+locale_formats: "{{ locale_lang }}"
diff --git a/roles/locale/templates/locale.j2 b/roles/locale/templates/locale.j2
index 075e08a..2c69b6d 100644
--- a/roles/locale/templates/locale.j2
+++ b/roles/locale/templates/locale.j2
@@ -1,6 +1,9 @@
 # {{ ansible_managed }}
 
-LANG="{{ lang }}"
-LC_MESSAGES="{{ lc_messages }}"
-LANGUAGE="{{ language }}"
-
+LANG={{ locale_lang }}
+LC_MESSAGES={{ locale_lc_messages }}
+LC_NUMERIC={{ locale_formats }}
+LC_TIME={{ locale_formats }}
+LC_MONETARY={{ locale_formats }}
+LC_PAPER={{ locale_formats }}
+LC_MEASUREMENT={{ locale_formats }}