diff --git a/tasks/locales.yml b/tasks/locales.yml
index 9174a08..679ceeb 100644
--- a/tasks/locales.yml
+++ b/tasks/locales.yml
@@ -1,9 +1,9 @@
 ---
 - name: set locales
-  locale_gen: name="{{ item.name }}" state="{{ item.state | default('present') }}"
+  locale_gen: "name={{ item.name }} state={{ item.state | default('present') }}"
   with_items: "{{ common_locales }}"
   when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
 
 - name: set default locale
-  lineinfile: dest="/etc/default/locale" regexp="LANG=" line="LANG={{ common_locales_default }}"
+  lineinfile: "dest=/etc/default/locale regexp=LANG= line=LANG={{ common_locales_default }}"
   when: common_locales_default and (ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu')
diff --git a/tasks/main.yml b/tasks/main.yml
index 03f22d7..6832c88 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -16,7 +16,7 @@
   tags: ['common', 'xbps']
 
 - import_tasks: cronie.yml
-  when: common_cronie and (ansible_distribution != 'Debian' or ansible_distribution != 'Ubuntu')
+  when: common_cronie and ansible_distribution != 'Debian' and ansible_distribution != 'Ubuntu'
   tags: ['common', 'cronie']
 
 - import_tasks: locales.yml