diff --git a/roles/base/tasks/desktop-environment.yml b/roles/base/tasks/desktop-environment.yml
index 878ee60..a7abda1 100644
--- a/roles/base/tasks/desktop-environment.yml
+++ b/roles/base/tasks/desktop-environment.yml
@@ -10,7 +10,7 @@
 
 - name: Installation of the desktop environment
   shell: "DEBIAN_FRONTEND=noninteractive /usr/bin/apt-get -y install edubuntu-desktop-gnome^"
-  when: check_edubuntu_pkg|changed
+  when: check_edubuntu_pkg is changed
   tags: edu-install
 
 - name: Change default desktop environment
diff --git a/roles/client/tasks/epoptes.yml b/roles/client/tasks/epoptes.yml
index f015e07..1560505 100644
--- a/roles/client/tasks/epoptes.yml
+++ b/roles/client/tasks/epoptes.yml
@@ -10,27 +10,27 @@
 - name: Checking for a correct name
   shell: cat /tmp/epoptes-srv
   register: epo_srv_name
-  when: get_epo_srv_name|changed
+  when: get_epo_srv_name is changed
   changed_when: "'none' not in epo_srv_name.stdout"
 
 - name: Cleanup
   file:
     path: /tmp/epoptes-srv
     state: absent
-  when: get_epo_srv_name|changed
+  when: get_epo_srv_name is changed
 
 - name: Ensuring epoptes-client is installed
   apt:
     name: epoptes-client
     state: present
-  when: get_epo_srv_name|changed
+  when: get_epo_srv_name is changed
 
 - name: Configuring the client
   replace:
     dest: /etc/default/epoptes-client
     regexp: "^#SERVER=server"
     replace: "SERVER={{ epo_srv_name.stdout }}"
-  when: epo_srv_name|changed
+  when: epo_srv_name is changed
 
 - name: Checking for an already existent certificate
   file:
@@ -41,7 +41,7 @@
 
 - name: Getting the epoptes server certificate 
   shell: /usr/sbin/epoptes-client -c
-  when: crt_epo_exists|failed
+  when: crt_epo_exists is failed
   # I don't notify anymore, hoping that this would be done on first run after
   # preseed and it should restart because of domain join.
   #notify:
diff --git a/roles/domain/tasks/domain_join.yml b/roles/domain/tasks/domain_join.yml
index 82fa057..87314c9 100644
--- a/roles/domain/tasks/domain_join.yml
+++ b/roles/domain/tasks/domain_join.yml
@@ -9,7 +9,7 @@
 
 - name: Joining domain
   shell: 'net rpc join -U admin%{{ domainadminpasswd }}'
-  when: check_domain|changed
+  when: check_domain is changed
   register: domainjoin
   notify:
     - reboot
diff --git a/roles/domain/tasks/glib2.yml b/roles/domain/tasks/glib2.yml
index a6f018a..f3dae0d 100644
--- a/roles/domain/tasks/glib2.yml
+++ b/roles/domain/tasks/glib2.yml
@@ -24,4 +24,4 @@
 
 - name: Recompiling glib2 schemas
   shell: glib-compile-schemas --strict /usr/share/glib-2.0/schemas/
-  when: cfg_glib_users|changed or cfg_glib_mounted|changed or cfg_keyb_layout|changed
+  when: cfg_glib_users is changed or cfg_glib_mounted is changed or cfg_keyb_layout is changed
diff --git a/roles/domain/tasks/ntp.yml b/roles/domain/tasks/ntp.yml
index bb69ae0..4a76160 100644
--- a/roles/domain/tasks/ntp.yml
+++ b/roles/domain/tasks/ntp.yml
@@ -26,4 +26,4 @@
 
 - name: Restarting NTP service
   shell: service ntp restart
-  when: cfg_ntp|changed
+  when: cfg_ntp is changed
diff --git a/roles/domain/tasks/pkgs.yml b/roles/domain/tasks/pkgs.yml
index 62abc9e..62898ed 100644
--- a/roles/domain/tasks/pkgs.yml
+++ b/roles/domain/tasks/pkgs.yml
@@ -20,7 +20,7 @@
 
 #- name: Downgrading SAMBA if not the right version
 #  shell: "/var/lib/{{ ansible_local.domain.domainfull }}/bin/downgrade_samba.sh"
-#  when: check_samba_version|changed
+#  when: check_samba_version is changed
 #
 #- name: Checking again for the correct SAMBA version
 #  shell: dpkg -l | grep libsmbclient
diff --git a/roles/domain/tasks/smb_config.yml b/roles/domain/tasks/smb_config.yml
index b13b693..6bbe316 100644
--- a/roles/domain/tasks/smb_config.yml
+++ b/roles/domain/tasks/smb_config.yml
@@ -17,11 +17,11 @@
 
 - name: SAMBA restart
   shell: /sbin/restart smbd
-  when: cfg_samba|changed
+  when: cfg_samba is changed
 
 - name: Winbind restart
   shell: /sbin/restart winbind
-  when: cfg_samba|changed
+  when: cfg_samba is changed
 
 - name: Creating home base
   file:
diff --git a/roles/domain/tasks/sslproxy.yml b/roles/domain/tasks/sslproxy.yml
index 7cb6372..16a4ec7 100644
--- a/roles/domain/tasks/sslproxy.yml
+++ b/roles/domain/tasks/sslproxy.yml
@@ -18,7 +18,7 @@
 
 - name: Adding certificates to the ones used by the system
   shell: update-ca-certificates
-  when: proxycrt_dwnl|changed
+  when: proxycrt_dwnl is changed
 
 - name: Firefox settings to include certificate
   get_url:
diff --git a/roles/prereq/tasks/repos.yml b/roles/prereq/tasks/repos.yml
index 1a97a5e..453de83 100644
--- a/roles/prereq/tasks/repos.yml
+++ b/roles/prereq/tasks/repos.yml
@@ -15,7 +15,7 @@
 
 - name: Installing libreoffice PPA GPG key
   shell: apt-key adv --keyserver keyserver.ubuntu.com --recv 1378B444
-  when: check_gpg_libreoffice|failed
+  when: check_gpg_libreoffice is failed
 
 - name: Checking for ansible PPA GPG key
   shell: apt-key list | grep -q 7BB9C367
@@ -24,7 +24,7 @@
 
 - name: Installing ansible PPA GPG key
   shell: apt-key adv --keyserver keyserver.ubuntu.com --recv 7BB9C367
-  when: check_gpg_ansible|failed
+  when: check_gpg_ansible is failed
 
 - name: Checking for epoptes PPA GPG key
   shell: apt-key list | grep -q 0350B375
@@ -33,7 +33,7 @@
 
 - name: Installing epoptes PPA GPG key
   shell: apt-key adv --keyserver keyserver.ubuntu.com --recv 0350B375
-  when: check_gpg_epoptes|failed
+  when: check_gpg_epoptes is failed
 
 - name: Checking for geogebra GPG key
   shell: apt-key list | grep -q 83A736CF
@@ -42,7 +42,7 @@
 
 - name: Installing geogebra GPG key
   shell: apt-key adv --keyserver keyserver.ubuntu.com --recv 83A736CF
-  when: check_gpg_geogebra|failed
+  when: check_gpg_geogebra is failed
 
 - name: Removing old repositories (if present)
   file: