diff --git a/roles/iscsi_client/tasks/main.yml b/roles/iscsi_client/tasks/main.yml
index 242effadc4..3d9489a557 100644
--- a/roles/iscsi_client/tasks/main.yml
+++ b/roles/iscsi_client/tasks/main.yml
@@ -3,13 +3,23 @@
 # This task sets up iscsid and mpathd on a machine. 
 #
 #
-- name: install packages needed for iscsi_client
+- name: install packages needed for iscsi_client (yum)
   yum: state=present name={{ item }}
   with_items:
   - iscsi-initiator-utils
   - device-mapper-multipath
   tags:
   - packages
+  when: ansible_distribution_major_version|int < 22
+
+- name: install packages needed for iscsi_client (dnf)
+  dnf: state=present name={{ item }}
+  with_items:
+  - iscsi-initiator-utils
+  - device-mapper-multipath
+  tags:
+  - packages
+  when: ansible_distribution_major_version|int > 21 and ansible_cmdline.ostree is not defined
 
 - name: enable iscsi service
   service: state=running enabled=yes name=iscsi