diff --git a/roles/upgrade/tasks/main.yml b/roles/upgrade/tasks/main.yml
index acb16f2896626a0ff625fad66a41cf310fe14089..e841289d2c98425765da97b22787be0c95b3c097 100644
--- a/roles/upgrade/tasks/main.yml
+++ b/roles/upgrade/tasks/main.yml
@@ -68,11 +68,10 @@
     name: '*'
     state: latest
     update_cache: yes
-    exclude: kernel*,mlnx-ofa_kernel*,kmod-lustre-client*,kmod-mlnx-ofa_kernel*,kmod-lustre-client*,lustre-client*,centos-release*, glusterfs*
+    exclude: kernel*,mlnx-ofa_kernel*,kmod-lustre-client*,kmod-mlnx-ofa_kernel*,kmod-lustre-client*,lustre-client*,centos-release*,glusterfs*
   become: true
   become_user: root
-  when:
-    - when: inventory_hostname in groups.ManagementNodes or inventory_hostname in groups.SQLNodes
+  when: ( inventory_hostname in groups.ManagementNodes ) or ( inventory_hostname in groups.SQLNodes )
 
 - name: yum upgrade
   yum:
@@ -82,8 +81,7 @@
     exclude: kernel*,mlnx-ofa_kernel*,kmod-lustre-client*,kmod-mlnx-ofa_kernel*,kmod-lustre-client*,lustre-client*,centos-release*
   become: true
   become_user: root
-  when:
-    - when: inventory_hostname not in groups.ManagementNodes and inventory_hostname not in groups.SQLNodes
+  when: ( inventory_hostname not in groups.ManagementNodes ) and ( inventory_hostname not in groups.SQLNodes )
 
 - name: Clear yum pending transaction
   command: yum-complete-transaction --cleanup-only