diff --git a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_family.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_family.yml
index 7c998f610..18d43caf6 100644
--- a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_family.yml
+++ b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_family.yml
@@ -41,4 +41,7 @@ required_packages:
 # package list as the installation causes name resolution changes that can
 # temporarily block packages following it while the system is being
 # reconfigured. See: https://review.opendev.org/#/c/223813
-iscsi_client_package: "open-iscsi"
+iscsi_required_packages:
+  - open-iscsi
+  - gdisk
+  - dosfstools
diff --git a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Fedora_25.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Fedora_25.yml
index af362c314..0966d4f7c 100644
--- a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Fedora_25.yml
+++ b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Fedora_25.yml
@@ -37,4 +37,7 @@ required_packages:
   - debootstrap
   - gcc
   - socat
-iscsi_client_package: "iscsi-initiator-utils"
+iscsi_required_packages:
+  - iscsi-initiator-utils
+  - gdisk
+  - dosfstools
diff --git a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Fedora_26.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Fedora_26.yml
index 892c05955..0491654a5 100644
--- a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Fedora_26.yml
+++ b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Fedora_26.yml
@@ -38,4 +38,7 @@ required_packages:
   - debootstrap
   - gcc
   - socat
-iscsi_client_package: "iscsi-initiator-utils"
+iscsi_required_packages:
+  - iscsi-initiator-utils
+  - gdisk
+  - dosfstools
diff --git a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Fedora_27.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Fedora_27.yml
index 892c05955..0491654a5 100644
--- a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Fedora_27.yml
+++ b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Fedora_27.yml
@@ -38,4 +38,7 @@ required_packages:
   - debootstrap
   - gcc
   - socat
-iscsi_client_package: "iscsi-initiator-utils"
+iscsi_required_packages:
+  - iscsi-initiator-utils
+  - gdisk
+  - dosfstools
diff --git a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_RedHat_family.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_RedHat_family.yml
index 529b9ac31..8f01886a7 100644
--- a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_RedHat_family.yml
+++ b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_RedHat_family.yml
@@ -37,4 +37,7 @@ required_packages:
   - gcc
   - python2-pip
   - socat
-iscsi_client_package: "iscsi-initiator-utils"
+iscsi_required_packages:
+  - iscsi-initiator-utils
+  - gdisk
+  - dosfstools
diff --git a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Suse_family.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Suse_family.yml
index 845de1286..9c50d06f4 100644
--- a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Suse_family.yml
+++ b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Suse_family.yml
@@ -45,4 +45,7 @@ required_packages:
   - python-pip
   - gcc
   - python-PyMySQL
-iscsi_client_package: "open-iscsi"
+iscsi_required_packages:
+  - open-iscsi
+  - gptfdisk
+  - dosfstools
diff --git a/playbooks/roles/bifrost-ironic-install/tasks/install.yml b/playbooks/roles/bifrost-ironic-install/tasks/install.yml
index 9d16957f2..211983a28 100644
--- a/playbooks/roles/bifrost-ironic-install/tasks/install.yml
+++ b/playbooks/roles/bifrost-ironic-install/tasks/install.yml
@@ -50,11 +50,11 @@
   environment: "{{ venv }}"
   when: skip_install is not defined
 
-# TODO(dtantsur): only do this is the iscsi deploy interface is enabled
-- name: "Install iSCSI client if PXE driver support is enabled"
-  action: "{{ ansible_pkg_mgr }} name={{ iscsi_client_package }} state=present"
+- name: "Install iSCSI client and dependencies if iscsi deploy interface is enabled"
+  action: "{{ ansible_pkg_mgr }} name={{ item }} state=present"
   environment: "{{ venv }}"
-  when: skip_install is not defined
+  with_items: "{{ iscsi_required_packages }}"
+  when: skip_install is not defined and 'iscsi' in enabled_deploy_interfaces
 
 - name: "Diskimage-builder - Install"
   include: pip_install.yml