diff --git a/roles/abrt/faf/tasks/cleanup.yml b/roles/abrt/faf/tasks/cleanup.yml
index e5131097ca..f2fb1e26f9 100644
--- a/roles/abrt/faf/tasks/cleanup.yml
+++ b/roles/abrt/faf/tasks/cleanup.yml
@@ -1,15 +1,15 @@
 ---
 - name: remove EOLed opsys
   command: faf releasemod -o "{{ item.opsys | lower }}" --opsys-release "{{ item.release }}" -s EOL
-  loop: "{{ eol_opsys | selectattr('opsys') | selectattr('release') | list }}"
+  loop: "{{ eol_opsys }}"
   become: yes
   become_user: faf
   failed_when: false
   changed_when: false
 
 - name: remove EOLed packages
-  command: faf cleanup-packages "{{ item.opsys | capitalize }}" "{{ item.release }}"
-  loop: "{{ eol_opsys | selectattr('opsys') | selectattr('release') | list }}"
+  command: faf cleanup-packages "{{ item.opsys }}" "{{ item.release }}"
+  loop: "{{ eol_opsys }}"
   become: yes
   become_user: faf
   failed_when: false