diff --git a/deployment/ironic/ironic-conductor-container-puppet.yaml b/deployment/ironic/ironic-conductor-container-puppet.yaml
index a097aac475..6b77ecdf4e 100644
--- a/deployment/ironic/ironic-conductor-container-puppet.yaml
+++ b/deployment/ironic/ironic-conductor-container-puppet.yaml
@@ -133,7 +133,7 @@ parameters:
                  type must have at least one valid implementation enabled.
     type: comma_delimited_list
   IronicEnabledDeployInterfaces:
-    default: ['iscsi', 'direct']
+    default: ['direct']
     description: Enabled deploy interface implementations. Each hardware
                  type must have at least one valid implementation enabled.
     type: comma_delimited_list
@@ -182,7 +182,7 @@ parameters:
     description: Whether to enable use of staging drivers.
     type: boolean
   IronicImageDownloadSource:
-    default: swift
+    default: http
     description: Image delivery method for the "direct" deploy interface.
                  Use "swift" for the Object Storage temporary URLs,
                  use "http" for the local HTTP server (the same as for iPXE).
diff --git a/environments/undercloud.yaml b/environments/undercloud.yaml
index e870222585..dbf586237c 100644
--- a/environments/undercloud.yaml
+++ b/environments/undercloud.yaml
@@ -114,7 +114,7 @@ parameter_defaults:
   IronicEnabledHardwareTypes: ['ipmi', 'redfish', 'idrac', 'ilo']
   IronicEnabledBootInterfaces: ['pxe', 'ilo-pxe']
   IronicEnabledConsoleInterfaces: ['ipmitool-socat', 'ilo', 'no-console']
-  IronicEnabledDeployInterfaces: ['iscsi', 'direct', 'ansible']
+  IronicEnabledDeployInterfaces: ['direct', 'ansible']
   IronicEnabledInspectInterfaces: ['inspector', 'no-inspect']
   IronicEnabledManagementInterfaces: ['ipmitool', 'redfish', 'idrac', 'ilo']
   # NOTE(dtantsur): disabling advanced networking as it's not used (or
@@ -130,6 +130,8 @@ parameter_defaults:
   IronicEnableStagingDrivers: true
   IronicCleaningNetwork: 'ctlplane'
   IronicForcePowerStateDuringSync: false
+  # NOTE(dtantsur): remove if/when swift is removed from the undercloud.
+  IronicImageDownloadSource: swift
   IronicInspectorCollectors: default,extra-hardware,numa-topology,logs
   IronicInspectorInterface: br-ctlplane
   # IronicInspectorSubnets:
diff --git a/releasenotes/notes/no-iscsi-df52429ef64f4093.yaml b/releasenotes/notes/no-iscsi-df52429ef64f4093.yaml
new file mode 100644
index 0000000000..1e71d59a74
--- /dev/null
+++ b/releasenotes/notes/no-iscsi-df52429ef64f4093.yaml
@@ -0,0 +1,13 @@
+---
+upgrade:
+  - |
+    The ``iscsi`` deploy interface is no longer enabled by default in ironic,
+    making the ``direct`` deploy interface the default. You will need to
+    update your nodes to the ``direct`` deploy before upgrading or re-enable
+    the ``iscsi`` deploy in ``IronicEnabledDeployInterfaces`` (but note that
+    it is going to be deprecated in the future).
+  - |
+    The ``IronicImageDownloadSource`` parameter has been changed to ``http`` by
+    default making ironic cache glance images and serve them via a local HTTP
+    server. Set the parameter to ``swift`` to return the previous behavior of
+    relying on swift temporary URLs.