diff --git a/evolinux-base/tasks/packages.yml b/evolinux-base/tasks/packages.yml
index d161a9f0..bf807ed1 100644
--- a/evolinux-base/tasks/packages.yml
+++ b/evolinux-base/tasks/packages.yml
@@ -1,5 +1,19 @@
 ---
 
+- name: Install/Update system tools
+  apt:
+    name: "{{ item }}"
+  with_items:
+  - locales
+  - sudo
+  - ntp
+  - ntpdate
+  - lsb-release
+  - dnsutils
+  - pv
+  - apg
+  - conntrack
+
 - name: Install/Update diagnostic tools
   apt:
     name: "{{ item }}"
@@ -13,19 +27,6 @@
   - tcpdump
   - mtr-tiny
 
-- name: Install/Update system tools
-  apt:
-    name: "{{ item }}"
-  with_items:
-  - sudo
-  - ntp
-  - ntpdate
-  - lsb-release
-  - dnsutils
-  - pv
-  - apg
-  - conntrack
-
 - name: Install/Update hardware tools
   apt:
     name: "{{ item }}"
diff --git a/evolinux-base/tasks/system.yml b/evolinux-base/tasks/system.yml
index d6837afd..a59fc390 100644
--- a/evolinux-base/tasks/system.yml
+++ b/evolinux-base/tasks/system.yml
@@ -9,13 +9,17 @@
   lineinfile:
     dest: /etc/locale.gen
     line: "{{ item }}"
+    create: yes
     state: present
   with_items:
     - "en_US.UTF-8 UTF-8"
     - "fr_FR ISO-8859-1"
     - "fr_FR.UTF-8 UTF-8"
-  notify: dpkg-reconfigure-locales
-  # when: not docker
+  register: default_locales
+
+- name: Reconfigure locales
+  command: /usr/sbin/locale-gen
+  when: default_locales | changed
 
 - name: Setting vim as default editor
   alternatives: