diff --git a/doc/dbus/bus/org.opensuse.Agama.Storage1.ISCSI.bus.xml b/doc/dbus/bus/org.opensuse.Agama.Storage1.ISCSI.bus.xml
new file mode 100644
index 0000000000..9c4cf92131
--- /dev/null
+++ b/doc/dbus/bus/org.opensuse.Agama.Storage1.ISCSI.bus.xml
@@ -0,0 +1,39 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node name="/org/opensuse/Agama/Storage1/ISCSI">
+  <interface name="org.freedesktop.DBus.Properties">
+    <method name="Get">
+      <arg name="interface_name" direction="in" type="s"/>
+      <arg name="property_name" direction="in" type="s"/>
+      <arg name="value" direction="out" type="v"/>
+    </method>
+    <method name="Set">
+      <arg name="interface_name" direction="in" type="s"/>
+      <arg name="property_name" direction="in" type="s"/>
+      <arg name="val" direction="in" type="v"/>
+    </method>
+    <method name="GetAll">
+      <arg name="interface_name" direction="in" type="s"/>
+      <arg name="value" direction="out" type="a{sv}"/>
+    </method>
+    <signal name="PropertiesChanged">
+      <arg name="interface" type="s"/>
+      <arg name="changed_properties" type="a{sv}"/>
+      <arg name="invalidated_properties" type="as"/>
+    </signal>
+  </interface>
+  <interface name="org.freedesktop.DBus.Introspectable">
+    <method name="Introspect">
+      <arg name="xml_data" direction="out" type="s"/>
+    </method>
+  </interface>
+  <interface name="org.opensuse.Agama1.Issues">
+    <property type="a(sssuu)" name="All" access="read"/>
+  </interface>
+  <interface name="org.opensuse.Agama.Storage1.ISCSI">
+    <method name="SetConfig">
+      <arg name="serialized_config" direction="in" type="s"/>
+      <arg name="result" direction="out" type="u"/>
+    </method>
+  </interface>
+</node>
diff --git a/doc/dbus/bus/org.opensuse.Agama.Storage1.bus.xml b/doc/dbus/bus/org.opensuse.Agama.Storage1.bus.xml
index 05e32dceac..4e727c41cc 100644
--- a/doc/dbus/bus/org.opensuse.Agama.Storage1.bus.xml
+++ b/doc/dbus/bus/org.opensuse.Agama.Storage1.bus.xml
@@ -1,26 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node name="/org/opensuse/Agama/Storage1">
+  <node name="ISCSI" />
   <node name="iscsi_nodes" />
+  <node name="staging" />
+  <node name="system" />
   <node name="zfcp_controllers" />
   <node name="zfcp_disks" />
-  <interface name="org.freedesktop.DBus.Introspectable">
-    <method name="Introspect">
-      <arg name="xml_data" direction="out" type="s"/>
-    </method>
-  </interface>
-  <interface name="org.freedesktop.DBus.ObjectManager">
-    <method name="GetManagedObjects">
-      <arg name="res" direction="out" type="a{oa{sa{sv}}}"/>
-    </method>
-    <signal name="InterfacesAdded">
-      <arg name="object" type="o"/>
-      <arg name="interfaces_and_properties" type="a{sa{sv}}"/>
-    </signal>
-    <signal name="InterfacesRemoved">
-      <arg name="object" type="o"/>
-      <arg name="interfaces" type="as"/>
-    </signal>
-  </interface>
   <interface name="org.freedesktop.DBus.Properties">
     <method name="Get">
       <arg name="interface_name" direction="in" type="s"/>
@@ -42,6 +28,42 @@
       <arg name="invalidated_properties" type="as"/>
     </signal>
   </interface>
+  <interface name="org.freedesktop.DBus.Introspectable">
+    <method name="Introspect">
+      <arg name="xml_data" direction="out" type="s"/>
+    </method>
+  </interface>
+  <interface name="org.freedesktop.DBus.ObjectManager">
+    <method name="GetManagedObjects">
+      <arg name="res" direction="out" type="a{oa{sa{sv}}}"/>
+    </method>
+    <signal name="InterfacesAdded">
+      <arg name="object" type="o"/>
+      <arg name="interfaces_and_properties" type="a{sa{sv}}"/>
+    </signal>
+    <signal name="InterfacesRemoved">
+      <arg name="object" type="o"/>
+      <arg name="interfaces" type="as"/>
+    </signal>
+  </interface>
+  <interface name="org.opensuse.Agama1.Issues">
+    <property type="a(sssuu)" name="All" access="read"/>
+  </interface>
+  <interface name="org.opensuse.Agama1.LocaleMixin">
+    <method name="SetLocale">
+      <arg name="locale" direction="in" type="s"/>
+    </method>
+  </interface>
+  <interface name="org.opensuse.Agama1.Progress">
+    <property type="u" name="TotalSteps" access="read"/>
+    <property type="(us)" name="CurrentStep" access="read"/>
+    <property type="b" name="Finished" access="read"/>
+    <property type="as" name="Steps" access="read"/>
+  </interface>
+  <interface name="org.opensuse.Agama1.ServiceStatus">
+    <property type="aa{sv}" name="All" access="read"/>
+    <property type="u" name="Current" access="read"/>
+  </interface>
   <interface name="org.opensuse.Agama.Storage1">
     <method name="Probe">
     </method>
@@ -65,7 +87,7 @@
       <arg name="serialized_model" direction="out" type="s"/>
     </method>
     <method name="SolveConfigModel">
-      <arg name="model" direction="in" type="s"/>
+      <arg name="sparse_model" direction="in" type="s"/>
       <arg name="solved_model" direction="out" type="s"/>
     </method>
     <method name="Install">
@@ -122,20 +144,20 @@
     <property type="s" name="InitiatorName" access="readwrite"/>
     <property type="b" name="IBFT" access="read"/>
   </interface>
-  <interface name="org.opensuse.Agama.Storage1.Proposal.Calculator">
+    <interface name="org.opensuse.Agama.Storage1.Proposal.Calculator">
     <method name="DefaultVolume">
       <arg name="mount_path" direction="in" type="s"/>
       <arg name="volume" direction="out" type="a{sv}"/>
     </method>
     <method name="Calculate">
-      <arg name="settings" direction="in" type="a{sv}"/>
+      <arg name="settings_dbus" direction="in" type="a{sv}"/>
       <arg name="result" direction="out" type="u"/>
     </method>
     <property type="ao" name="AvailableDevices" access="read"/>
     <property type="as" name="ProductMountPoints" access="read"/>
-    <property type="o" name="Result" access="read"/>
+    <property type="as" name="EncryptionMethods" access="read"/>
   </interface>
-  <interface name="org.opensuse.Agama.Storage1.ZFCP.Manager">
+    <interface name="org.opensuse.Agama.Storage1.ZFCP.Manager">
     <method name="Probe">
     </method>
     <property type="b" name="AllowLUNScan" access="read"/>
diff --git a/doc/dbus/org.opensuse.Agama.Storage1.ISCSI.Initiator.doc.xml b/doc/dbus/org.opensuse.Agama.Storage1.ISCSI.Initiator.doc.xml
index 16909f5447..8773ecb5e3 100644
--- a/doc/dbus/org.opensuse.Agama.Storage1.ISCSI.Initiator.doc.xml
+++ b/doc/dbus/org.opensuse.Agama.Storage1.ISCSI.Initiator.doc.xml
@@ -1,7 +1,10 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
 "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node name="/org/opensuse/Agama/Storage1">
+  <node name="ISCSI" />
   <node name="iscsi_nodes" />
+  <node name="staging" />
+  <node name="system" />
   <node name="zfcp_controllers" />
   <node name="zfcp_disks" />
   <interface name="org.opensuse.Agama.Storage1.ISCSI.Initiator">
diff --git a/doc/dbus/org.opensuse.Agama.Storage1.ISCSI.doc.xml b/doc/dbus/org.opensuse.Agama.Storage1.ISCSI.doc.xml
new file mode 100644
index 0000000000..ce66e330e6
--- /dev/null
+++ b/doc/dbus/org.opensuse.Agama.Storage1.ISCSI.doc.xml
@@ -0,0 +1,21 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node name="/org/opensuse/Agama/Storage1/ISCSI">
+  <interface name="org.opensuse.Agama.Storage1.ISCSI">
+    <!--
+      Sets the iSCSI config.
+    -->
+    <method name="SetConfig">
+      <!--
+        See iscsi.schema.json
+      -->
+      <arg name="serialized_config" direction="in" type="s"/>
+      <!--
+        Whether the config was correctly applied:
+          0: success
+          1: failure
+      -->
+      <arg name="result" direction="out" type="u"/>
+    </method>
+  </interface>
+</node>
diff --git a/doc/dbus/org.opensuse.Agama.Storage1.Proposal.Calculator.doc.xml b/doc/dbus/org.opensuse.Agama.Storage1.Proposal.Calculator.doc.xml
index 5d2d449095..14068f2812 100644
--- a/doc/dbus/org.opensuse.Agama.Storage1.Proposal.Calculator.doc.xml
+++ b/doc/dbus/org.opensuse.Agama.Storage1.Proposal.Calculator.doc.xml
@@ -1,7 +1,10 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
 "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node name="/org/opensuse/Agama/Storage1">
+  <node name="ISCSI" />
   <node name="iscsi_nodes" />
+  <node name="staging" />
+  <node name="system" />
   <node name="zfcp_controllers" />
   <node name="zfcp_disks" />
   <!--
@@ -70,7 +73,7 @@
           Snapshots               b (makes sense only for btrfs)
           Transactional           b (makes sense only for btrfs)
       -->
-      <arg name="settings" direction="in" type="a{sv}"/>
+      <arg name="settings_dbus" direction="in" type="a{sv}"/>
       <!--
         Whether the proposal was correctly calculated:
           0: success
@@ -84,7 +87,7 @@
       values for these mount points (e.g., min and max sizes, file system type, etc).
     -->
     <property type="as" name="ProductMountPoints" access="read"/>
-    <property type="o" name="Result" access="read"/>
+    <property type="as" name="EncryptionMethods" access="read"/>
   </interface>
 
 </node>
diff --git a/doc/dbus/org.opensuse.Agama.Storage1.doc.xml b/doc/dbus/org.opensuse.Agama.Storage1.doc.xml
index 3f06d349a1..8c1a49df11 100644
--- a/doc/dbus/org.opensuse.Agama.Storage1.doc.xml
+++ b/doc/dbus/org.opensuse.Agama.Storage1.doc.xml
@@ -1,7 +1,10 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
 "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node name="/org/opensuse/Agama/Storage1">
+  <node name="ISCSI" />
   <node name="iscsi_nodes" />
+  <node name="staging" />
+  <node name="system" />
   <node name="zfcp_controllers" />
   <node name="zfcp_disks" />
   <interface name="org.opensuse.Agama.Storage1">
@@ -146,7 +149,7 @@
           ]
         }
       -->
-      <arg name="model" direction="in" type="s"/>
+      <arg name="sparse_model" direction="in" type="s"/>
       <!--
         E.g.,
         {
diff --git a/rust/agama-lib/share/examples/iscsi.json b/rust/agama-lib/share/examples/iscsi.json
new file mode 100644
index 0000000000..6899bb03aa
--- /dev/null
+++ b/rust/agama-lib/share/examples/iscsi.json
@@ -0,0 +1,46 @@
+{
+  "storage": {
+    "drives": [
+      {
+        "partitions": [{ "generate": "default" }]
+      }
+    ]
+  },
+  "iscsi": {
+    "initiator": "iqn.2013-02.de.suse:01:e229358d2dea",
+    "targets": [
+      {
+        "address": "192.168.1.1",
+        "port": 3260,
+        "name": "iqn.2001-05.com.doe:test1",
+        "interface": "default",
+        "startup": "onboot",
+        "authByTarget": {
+          "username": "test",
+          "password": "12345"
+        }
+      },
+      {
+        "address": "192.168.1.1",
+        "port": 3260,
+        "name": "iqn.2001-05.com.doe:test2",
+        "interface": "default",
+        "startup": "manual",
+        "authByTarget": {
+          "username": "test",
+          "password": "12345"
+        },
+        "authByInitiator": {
+          "username": "test",
+          "password": "12345"
+        }
+      },
+      {
+        "address": "192.168.1.1",
+        "port": 3261,
+        "name": "iqn.2001-05.com.doe:test3",
+        "interface": "default"
+      }
+    ]
+  }
+}
diff --git a/rust/agama-lib/share/iscsi.schema.json b/rust/agama-lib/share/iscsi.schema.json
new file mode 100644
index 0000000000..f91243f7a5
--- /dev/null
+++ b/rust/agama-lib/share/iscsi.schema.json
@@ -0,0 +1,51 @@
+{
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
+  "title": "Config",
+  "description": "iSCSI config.",
+  "type": "object",
+  "additionalProperties": false,
+  "properties": {
+    "initiator": {
+      "description": "Initiator name.",
+      "type": "string"
+    },
+    "targets": {
+      "description": "List of targets.",
+      "type": "array",
+      "items": { "$ref": "#/$defs/target" }
+    }
+  },
+  "$defs": {
+    "target": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": ["address", "port", "name", "interface"],
+      "properties": {
+        "address": {
+          "description": "IP address.",
+          "type": "string"
+        },
+        "port": {
+          "type": "integer",
+          "minimum": 0
+        },
+        "name": { "type": "string" },
+        "interface": { "type": "string" },
+        "startup": {
+          "enum": ["onboot", "manual", "automatic"]
+        },
+        "authByTarget": { "$ref": "#/$defs/authentication" },
+        "authByInitiator": { "$ref": "#/$defs/authentication" }
+      }
+    },
+    "authentication": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": ["username", "password"],
+      "properties": {
+        "username": { "type": "string" },
+        "password": { "type": "string" }
+      }
+    }
+  }
+}
diff --git a/rust/agama-lib/share/profile.schema.json b/rust/agama-lib/share/profile.schema.json
index 3c1badd104..59e7e1af8b 100644
--- a/rust/agama-lib/share/profile.schema.json
+++ b/rust/agama-lib/share/profile.schema.json
@@ -538,6 +538,9 @@
       "items": {
         "type": "object"
       }
+    },
+    "iscsi": {
+      "$ref": "iscsi.schema.json"
     }
   },
   "$defs": {
diff --git a/rust/agama-lib/src/install_settings.rs b/rust/agama-lib/src/install_settings.rs
index 6fc8291e8c..fd487b7a3e 100644
--- a/rust/agama-lib/src/install_settings.rs
+++ b/rust/agama-lib/src/install_settings.rs
@@ -50,6 +50,9 @@ pub struct InstallSettings {
     pub files: Option<Vec<UserFile>>,
     #[serde(default)]
     pub hostname: Option<HostnameSettings>,
+    #[serde(default)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub iscsi: Option<Box<RawValue>>,
     #[serde(default, flatten)]
     pub user: Option<UserSettings>,
     #[serde(default)]
diff --git a/rust/agama-lib/src/storage/client/iscsi.rs b/rust/agama-lib/src/storage/client/iscsi.rs
index 479f4cb852..ff7ee64185 100644
--- a/rust/agama-lib/src/storage/client/iscsi.rs
+++ b/rust/agama-lib/src/storage/client/iscsi.rs
@@ -24,9 +24,10 @@ use std::collections::HashMap;
 use crate::{
     dbus::{extract_id_from_path, get_property},
     error::ServiceError,
-    storage::proxies::iscsi::{InitiatorProxy, NodeProxy},
+    storage::proxies::iscsi::{ISCSIProxy, InitiatorProxy, NodeProxy},
 };
 use serde::{Deserialize, Serialize};
+use serde_json::value::RawValue;
 use thiserror::Error;
 use zbus::{
     fdo::ObjectManagerProxy,
@@ -128,6 +129,7 @@ pub struct ISCSIClient<'a> {
     connection: zbus::Connection,
     initiator_proxy: InitiatorProxy<'a>,
     object_manager_proxy: ObjectManagerProxy<'a>,
+    iscsi_proxy: ISCSIProxy<'a>,
 }
 
 impl<'a> ISCSIClient<'a> {
@@ -144,10 +146,13 @@ impl<'a> ISCSIClient<'a> {
             .build()
             .await?;
 
+        let iscsi_proxy = ISCSIProxy::builder(&connection).build().await?;
+
         Ok(Self {
             connection,
             initiator_proxy,
             object_manager_proxy,
+            iscsi_proxy,
         })
     }
 
@@ -277,6 +282,20 @@ impl<'a> ISCSIClient<'a> {
             .await?;
         Ok(proxy)
     }
+
+    pub async fn set_config(&self, value: &RawValue) -> Result<(), ServiceError> {
+        let result = self
+            .iscsi_proxy
+            .set_config(&serde_json::to_string(value)?)
+            .await?;
+        if result == 0 {
+            Ok(())
+        } else {
+            Err(ServiceError::UnsuccessfulAction(
+                "Failed to set iscsi config".to_string(),
+            )) // TODO: can we get better error?
+        }
+    }
 }
 
 #[derive(Serialize, utoipa::ToSchema)]
diff --git a/rust/agama-lib/src/storage/http_client.rs b/rust/agama-lib/src/storage/http_client.rs
index f6f49aeab7..47fb2beb3b 100644
--- a/rust/agama-lib/src/storage/http_client.rs
+++ b/rust/agama-lib/src/storage/http_client.rs
@@ -19,6 +19,8 @@
 // find current contact information at www.suse.com.
 
 //! Implements a client to access Agama's storage service.
+use serde_json::value::RawValue;
+
 use crate::base_http_client::BaseHTTPClient;
 use crate::storage::StorageSettings;
 use crate::ServiceError;
@@ -40,3 +42,23 @@ impl StorageHTTPClient {
         self.client.put_void("/storage/config", config).await
     }
 }
+
+pub struct ISCSIHTTPClient {
+    client: BaseHTTPClient,
+}
+
+impl ISCSIHTTPClient {
+    pub fn new(base: BaseHTTPClient) -> Self {
+        Self { client: base }
+    }
+
+    pub async fn get_config(&self) -> Result<Option<StorageSettings>, ServiceError> {
+        // TODO: implement it as part of next step
+        //self.client.get("/storage/config").await
+        Ok(None)
+    }
+
+    pub async fn set_config(&self, config: &Box<RawValue>) -> Result<(), ServiceError> {
+        self.client.post_void("/iscsi/config", config).await
+    }
+}
diff --git a/rust/agama-lib/src/storage/proxies/iscsi.rs b/rust/agama-lib/src/storage/proxies/iscsi.rs
index 6b5e0cc8ab..ca3d1ef5be 100644
--- a/rust/agama-lib/src/storage/proxies/iscsi.rs
+++ b/rust/agama-lib/src/storage/proxies/iscsi.rs
@@ -23,3 +23,15 @@ pub use initiator::InitiatorProxy;
 
 mod node;
 pub use node::NodeProxy;
+
+use zbus::proxy;
+#[proxy(
+    default_service = "org.opensuse.Agama.Storage1",
+    default_path = "/org/opensuse/Agama/Storage1/ISCSI",
+    interface = "org.opensuse.Agama.Storage1.ISCSI",
+    assume_defaults = true
+)]
+pub trait ISCSI {
+    /// SetConfig method
+    fn set_config(&self, serialized_config: &str) -> zbus::Result<u32>;
+}
diff --git a/rust/agama-lib/src/store.rs b/rust/agama-lib/src/store.rs
index 643bbe6e8a..ba0c69f878 100644
--- a/rust/agama-lib/src/store.rs
+++ b/rust/agama-lib/src/store.rs
@@ -29,6 +29,7 @@ use crate::hostname::store::HostnameStore;
 use crate::install_settings::InstallSettings;
 use crate::manager::{InstallationPhase, ManagerHTTPClient};
 use crate::scripts::{ScriptsClient, ScriptsGroup};
+use crate::storage::http_client::ISCSIHTTPClient;
 use crate::{
     localization::LocalizationStore, network::NetworkStore, product::ProductStore,
     scripts::ScriptsStore, software::SoftwareStore, storage::StorageStore, users::UsersStore,
@@ -51,6 +52,7 @@ pub struct Store {
     storage: StorageStore,
     localization: LocalizationStore,
     scripts: ScriptsStore,
+    iscsi_client: ISCSIHTTPClient,
     manager_client: ManagerHTTPClient,
     http_client: BaseHTTPClient,
 }
@@ -69,6 +71,7 @@ impl Store {
             storage: StorageStore::new(http_client.clone())?,
             scripts: ScriptsStore::new(http_client.clone()),
             manager_client: ManagerHTTPClient::new(http_client.clone()),
+            iscsi_client: ISCSIHTTPClient::new(http_client.clone()),
             http_client,
         })
     }
@@ -137,6 +140,10 @@ impl Store {
         if let Some(software) = &settings.software {
             self.software.store(software).await?;
         }
+        // iscsi has to be done before storage
+        if let Some(iscsi) = &settings.iscsi {
+            self.iscsi_client.set_config(iscsi).await?
+        }
         if settings.storage.is_some() || settings.storage_autoyast.is_some() {
             self.storage.store(&settings.into()).await?
         }
diff --git a/rust/agama-server/src/storage/web.rs b/rust/agama-server/src/storage/web.rs
index d4eb3f30fb..0667ccc4e3 100644
--- a/rust/agama-server/src/storage/web.rs
+++ b/rust/agama-server/src/storage/web.rs
@@ -38,6 +38,7 @@ use axum::{
     routing::{get, post, put},
     Json, Router,
 };
+use iscsi::storage_iscsi_service;
 use serde::{Deserialize, Serialize};
 use serde_json::value::RawValue;
 use tokio_stream::{Stream, StreamExt};
@@ -51,7 +52,7 @@ use crate::{
     error::Error,
     storage::web::{
         dasd::{dasd_service, dasd_stream},
-        iscsi::{iscsi_service, iscsi_stream},
+        iscsi::iscsi_stream,
     },
     web::{
         common::{
@@ -105,7 +106,7 @@ pub async fn storage_service(dbus: zbus::Connection) -> Result<Router, ServiceEr
     let status_router = service_status_router(&dbus, DBUS_SERVICE, DBUS_PATH).await?;
     let progress_router = progress_router(&dbus, DBUS_SERVICE, DBUS_PATH).await?;
     let issues_router = issues_router(&dbus, DBUS_SERVICE, DBUS_PATH).await?;
-    let iscsi_router = iscsi_service(&dbus).await?;
+    let iscsi_router = storage_iscsi_service(&dbus).await?;
     let dasd_router = dasd_service(&dbus).await?;
     let zfcp_router = zfcp_service(&dbus).await?;
     let jobs_router = jobs_service(&dbus, DBUS_DESTINATION, DBUS_PATH).await?;
diff --git a/rust/agama-server/src/storage/web/iscsi.rs b/rust/agama-server/src/storage/web/iscsi.rs
index 254092b706..99a859999b 100644
--- a/rust/agama-server/src/storage/web/iscsi.rs
+++ b/rust/agama-server/src/storage/web/iscsi.rs
@@ -27,7 +27,10 @@
 
 use crate::{
     error::Error,
-    web::{common::EventStreams, Event},
+    web::{
+        common::{issues_router, EventStreams},
+        Event,
+    },
 };
 use agama_lib::{
     dbus::{get_optional_property, to_owned_hash},
@@ -47,6 +50,7 @@ use axum::{
 use serde::Deserialize;
 
 mod stream;
+use serde_json::value::RawValue;
 use stream::ISCSINodeStream;
 use tokio_stream::{Stream, StreamExt};
 use zbus::{
@@ -113,10 +117,16 @@ struct ISCSIState<'a> {
 ///
 /// It acts as a proxy to Agama D-Bus service.
 ///
+/// note: storage_iscsi_service is used by the interactive installation (i.e., the web UI). And
+/// iscsi_server is used for the new iSCSI API, which allows to load the iscsi section of the
+/// configuration (at this moment, used by CLI or unattended installation). The preliminary plan is
+/// moving all user interfaces to use only iscsi_service.
+///
 /// * `dbus`: D-Bus connection to use.
-pub async fn iscsi_service<T>(dbus: &zbus::Connection) -> Result<Router<T>, ServiceError> {
+pub async fn storage_iscsi_service<T>(dbus: &zbus::Connection) -> Result<Router<T>, ServiceError> {
     let client = ISCSIClient::new(dbus.clone()).await?;
     let state = ISCSIState { client };
+
     let router = Router::new()
         .route("/initiator", get(initiator).patch(update_initiator))
         .route("/nodes", get(nodes))
@@ -128,6 +138,45 @@ pub async fn iscsi_service<T>(dbus: &zbus::Connection) -> Result<Router<T>, Serv
     Ok(router)
 }
 
+/// Sets up and returns the Axum service for the iSCSI module.
+///
+/// It acts as a proxy to Agama D-Bus service.
+///
+/// * `dbus`: D-Bus connection to use.
+pub async fn iscsi_service<T>(dbus: zbus::Connection) -> Result<Router<T>, ServiceError> {
+    const DBUS_SERVICE: &str = "org.opensuse.Agama.Storage1";
+    const DBUS_PATH: &str = "/org/opensuse/Agama/Storage1/ISCSI";
+
+    let client = ISCSIClient::new(dbus.clone()).await?;
+    let state = ISCSIState { client };
+    let issues_router = issues_router(&dbus, DBUS_SERVICE, DBUS_PATH).await?;
+    let router = Router::new()
+        .route("/config", post(set_config))
+        .nest("/issues", issues_router)
+        .with_state(state);
+    Ok(router)
+}
+
+/// Sets iSCSI configuration
+///
+/// the json is identical to what iscsi node in profile use.
+#[utoipa::path(
+    post,
+    path="/config",
+    context_path="/api/iscsi",
+    request_body=String, // FIXME: workaround to avoid defining schema here. Identical happens for storage set_config
+    responses(
+        (status = OK, description = "Set config succeed."),
+        (status = BAD_REQUEST, description = "It could not set the config."),
+    )
+)]
+async fn set_config(
+    State(state): State<ISCSIState<'_>>,
+    Json(config): Json<Box<RawValue>>,
+) -> Result<(), Error> {
+    Ok(state.client.set_config(&config).await?)
+}
+
 /// Returns the iSCSI initiator properties.
 ///
 /// The iSCSI properties include the name and whether iBFT is enabled.
diff --git a/rust/agama-server/src/web.rs b/rust/agama-server/src/web.rs
index 128f045ba4..c8ede689aa 100644
--- a/rust/agama-server/src/web.rs
+++ b/rust/agama-server/src/web.rs
@@ -35,7 +35,7 @@ use crate::{
     questions::web::{questions_service, questions_stream},
     scripts::web::scripts_service,
     software::web::{software_service, software_streams},
-    storage::web::{storage_service, storage_streams},
+    storage::web::{iscsi::iscsi_service, storage_service, storage_streams},
     users::web::{users_service, users_streams},
     web::common::{issues_stream, jobs_stream, progress_stream, service_status_stream},
 };
@@ -82,6 +82,7 @@ where
         .add_service("/manager", manager_service(dbus.clone()).await?)
         .add_service("/software", software_service(dbus.clone()).await?)
         .add_service("/storage", storage_service(dbus.clone()).await?)
+        .add_service("/iscsi", iscsi_service(dbus.clone()).await?)
         .add_service("/bootloader", bootloader_service(dbus.clone()).await?)
         .add_service("/network", network_service(network_adapter, events).await?)
         .add_service("/questions", questions_service(dbus.clone()).await?)
diff --git a/rust/agama-server/src/web/docs/storage.rs b/rust/agama-server/src/web/docs/storage.rs
index 9e0159fedc..02062f5a25 100644
--- a/rust/agama-server/src/web/docs/storage.rs
+++ b/rust/agama-server/src/web/docs/storage.rs
@@ -59,6 +59,7 @@ impl ApiDocBuilder for StorageApiDocBuilder {
             .path_from::<crate::storage::web::iscsi::__path_nodes>()
             .path_from::<crate::storage::web::iscsi::__path_update_initiator>()
             .path_from::<crate::storage::web::iscsi::__path_update_node>()
+            .path_from::<crate::storage::web::iscsi::__path_set_config>()
             .path_from::<crate::storage::web::zfcp::__path_activate_controller>()
             .path_from::<crate::storage::web::zfcp::__path_activate_controller>()
             .path_from::<crate::storage::web::zfcp::__path_activate_disk>()
diff --git a/rust/package/agama.changes b/rust/package/agama.changes
index f4be1fb5dd..104d8f054c 100644
--- a/rust/package/agama.changes
+++ b/rust/package/agama.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Apr  9 05:35:22 UTC 2025 - José Iván López González <jlopez@suse.com>
+
+- Add HTTP API for configuring iSCSI (gh#agama-project/agama#2231).
+
 -------------------------------------------------------------------
 Tue Apr  8 22:04:03 UTC 2025 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
 
diff --git a/service/lib/agama/dbus/interfaces/progress.rb b/service/lib/agama/dbus/interfaces/progress.rb
index 104952910f..67881a8194 100644
--- a/service/lib/agama/dbus/interfaces/progress.rb
+++ b/service/lib/agama/dbus/interfaces/progress.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2022] SUSE LLC
+# Copyright (c) [2022-2025] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -26,26 +26,18 @@ module DBus
     module Interfaces
       # Mixin to define the Progress D-Bus interface
       #
-      # @note This mixin is expected to be included in a class inherited from {DBus::BaseObject}
-      #   class and it requires a #backend method that returns an instance of a class including the
-      #   {Agama::WithProgress} mixin.
+      # @note This mixin is expected to be included by a class which inherits from
+      #   {DBus::BaseObject} and that includes the {Agama::DBus::WithProgress} mixin.
       #
       # @example
-      #   class Backend
-      #     include Agama::WithProgress
-      #   end
-      #
       #   class Demo < Agama::DBus::BaseObject
+      #     include Agama::DBus::WithProgress
       #     include Agama::DBus::Interfaces::Progress
       #
       #     def initialize
       #       super("org.test.Demo")
       #       register_progress_callbacks
       #     end
-      #
-      #     def backend
-      #       @backend ||= Backend.new
-      #     end
       #   end
       module Progress
         PROGRESS_INTERFACE = "org.opensuse.Agama1.Progress"
@@ -54,16 +46,16 @@ module Progress
         #
         # @return [Integer] 0 if no progress defined
         def progress_total_steps
-          return 0 unless backend.progress
+          return 0 unless progress
 
-          backend.progress.total_steps
+          progress.total_steps
         end
 
         # Current step data
         #
         # @return [Array(Number,String)] Step id and description
         def progress_current_step
-          current_step = backend.progress&.current_step
+          current_step = progress&.current_step
           return [0, ""] unless current_step
 
           [current_step.id, current_step.description]
@@ -73,18 +65,18 @@ def progress_current_step
         #
         # @return [Boolean]
         def progress_finished
-          return true unless backend.progress
+          return true unless progress
 
-          backend.progress.finished?
+          progress.finished?
         end
 
         # Returns the known step descriptions
         #
         # @return [Array<String>]
         def progress_steps
-          return [] unless backend.progress
+          return [] unless progress
 
-          backend.progress.descriptions
+          progress.descriptions
         end
 
         # D-Bus properties of the Progress interface
@@ -98,11 +90,11 @@ def progress_properties
         #
         # @note This method is expected to be called in the constructor.
         def register_progress_callbacks
-          backend.on_progress_change do
+          progress_manager.on_change do
             dbus_properties_changed(PROGRESS_INTERFACE, progress_properties, [])
           end
 
-          backend.on_progress_finish do
+          progress_manager.on_finish do
             dbus_properties_changed(PROGRESS_INTERFACE, progress_properties, [])
           end
         end
diff --git a/service/lib/agama/dbus/interfaces/service_status.rb b/service/lib/agama/dbus/interfaces/service_status.rb
index 807ab0d8ac..838087eb6b 100644
--- a/service/lib/agama/dbus/interfaces/service_status.rb
+++ b/service/lib/agama/dbus/interfaces/service_status.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2022] SUSE LLC
+# Copyright (c) [2022-2025] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -26,21 +26,18 @@ module DBus
     module Interfaces
       # Mixin to define the ServiceStatus D-Bus interface
       #
-      # @note This mixin is expected to be included in a class inherited from {::DBus::Object} and
-      #   it requires a #service_status method that returns a {Agama::DBus::ServiceStatus}
-      #   object.
+      # @note This mixin is expected to be included by a class which inherits from
+      #   {DBus::BaseObject} and that includes the {Agama::DBus::WithServiceStatus} mixin.
       #
       # @example
       #   class Demo < ::DBus::Object
+      #     include Agama::DBus::WithServiceStatus
       #     include Agama::DBus::Interfaces::ServiceStatus
       #
       #     def initialize
       #       super("org.test.Demo")
       #       register_service_status_callbacks
       #     end
-      #
-      #     def service_status
-      #       @service_status ||= Agama::DBus::ServiceStatus.new
       #   end
       module ServiceStatus
         SERVICE_STATUS_INTERFACE = "org.opensuse.Agama1.ServiceStatus"
diff --git a/service/lib/agama/dbus/manager.rb b/service/lib/agama/dbus/manager.rb
index 268c7df072..f6a8d7b50e 100644
--- a/service/lib/agama/dbus/manager.rb
+++ b/service/lib/agama/dbus/manager.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2021] SUSE LLC
+# Copyright (c) [2021-2025] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -20,18 +20,20 @@
 # find current contact information at www.suse.com.
 
 require "dbus"
-require "agama/manager"
+require "agama/autoyast/converter"
 require "agama/dbus/base_object"
-require "agama/dbus/with_service_status"
-require "agama/dbus/interfaces/progress"
 require "agama/dbus/interfaces/locale"
+require "agama/dbus/interfaces/progress"
 require "agama/dbus/interfaces/service_status"
-require "agama/autoyast/converter"
+require "agama/dbus/with_progress"
+require "agama/dbus/with_service_status"
+require "agama/manager"
 
 module Agama
   module DBus
     # D-Bus object to manage the installation process
     class Manager < BaseObject
+      include WithProgress
       include WithServiceStatus
       include Interfaces::Progress
       include Interfaces::ServiceStatus
diff --git a/service/lib/agama/dbus/service_status.rb b/service/lib/agama/dbus/service_status.rb
index 5b128b37cc..4276d89ddd 100644
--- a/service/lib/agama/dbus/service_status.rb
+++ b/service/lib/agama/dbus/service_status.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2022] SUSE LLC
+# Copyright (c) [2022-2025] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -63,6 +63,17 @@ def busy
         self
       end
 
+      # Sets the service status to busy meanwhile the given block is running
+      #
+      # @param block [Proc]
+      # @return [Object] the result of the given block
+      def busy_while(&block)
+        busy
+        block.call
+      ensure
+        idle
+      end
+
       # Registers a callback to be called when the service status changes
       #
       # @param block [Proc]
diff --git a/service/lib/agama/dbus/software/manager.rb b/service/lib/agama/dbus/software/manager.rb
index 254b2f8de9..9ef26becf7 100644
--- a/service/lib/agama/dbus/software/manager.rb
+++ b/service/lib/agama/dbus/software/manager.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2022-2024] SUSE LLC
+# Copyright (c) [2022-2025] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -27,6 +27,7 @@
 require "agama/dbus/interfaces/locale"
 require "agama/dbus/interfaces/progress"
 require "agama/dbus/interfaces/service_status"
+require "agama/dbus/with_progress"
 require "agama/dbus/with_service_status"
 
 module Agama
@@ -34,6 +35,7 @@ module DBus
     module Software
       # D-Bus object to manage software installation
       class Manager < BaseObject
+        include WithProgress
         include WithServiceStatus
         include Interfaces::Progress
         include Interfaces::ServiceStatus
diff --git a/service/lib/agama/dbus/storage.rb b/service/lib/agama/dbus/storage.rb
index e16e2d496d..8f743fe45c 100644
--- a/service/lib/agama/dbus/storage.rb
+++ b/service/lib/agama/dbus/storage.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2022] SUSE LLC
+# Copyright (c) [2022-2025] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -27,5 +27,6 @@ module Storage
   end
 end
 
+require "agama/dbus/storage/iscsi"
 require "agama/dbus/storage/manager"
 require "agama/dbus/storage/proposal"
diff --git a/service/lib/agama/dbus/storage/iscsi.rb b/service/lib/agama/dbus/storage/iscsi.rb
new file mode 100644
index 0000000000..8206367dfc
--- /dev/null
+++ b/service/lib/agama/dbus/storage/iscsi.rb
@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+# Copyright (c) [2025] SUSE LLC
+#
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of version 2 of the GNU General Public License as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE LLC about this file by physical or electronic mail, you may
+# find current contact information at www.suse.com.
+
+require "dbus"
+require "json"
+require "agama/dbus/base_object"
+require "agama/dbus/interfaces/issues"
+require "agama/dbus/with_service_status"
+
+module Agama
+  module DBus
+    module Storage
+      # D-Bus object to manage iSCSI.
+      class ISCSI < BaseObject
+        include WithServiceStatus
+        include DBus::Interfaces::Issues
+
+        PATH = "/org/opensuse/Agama/Storage1/ISCSI"
+        private_constant :PATH
+
+        # @param backend [Agama::Storage::ISCSI::Manager]
+        # @param service_status [Agama::DBus::ServiceStatus, nil]
+        # @param logger [Logger, nil]
+        def initialize(backend, service_status: nil, logger: nil)
+          super(PATH, logger: logger)
+          @backend = backend
+          @service_status = service_status
+          register_callbacks
+        end
+
+        # List of issues, see {DBus::Interfaces::Issues}
+        #
+        # @return [Array<Agama::Issue>]
+        def issues
+          backend.issues
+        end
+
+        ISCSI_INTERFACE = "org.opensuse.Agama.Storage1.ISCSI"
+        private_constant :ISCSI_INTERFACE
+
+        # Applies the given serialized iSCSI config according to the JSON schema.
+        #
+        # @todo Raise error if the config is not valid.
+        #
+        # @param serialized_config [String] Serialized iSCSI config.
+        # @return [Integer] 0 success; 1 error
+        def apply_config(serialized_config)
+          logger.info("Setting iSCSI config from D-Bus: #{serialized_config}")
+
+          config_json = JSON.parse(serialized_config, symbolize_names: true)
+          success = backend.apply_config_json(config_json)
+          success ? 0 : 1
+        end
+
+        dbus_interface ISCSI_INTERFACE do
+          dbus_method(:SetConfig, "in serialized_config:s, out result:u") do |serialized_config|
+            busy_while { apply_config(serialized_config) }
+          end
+        end
+
+      private
+
+        # @return [Agama::Storage::ISCSI::Manager]
+        attr_reader :backend
+
+        def register_callbacks
+          backend.on_issues_change { issues_properties_changed }
+        end
+      end
+    end
+  end
+end
diff --git a/service/lib/agama/dbus/storage/iscsi_node.rb b/service/lib/agama/dbus/storage/iscsi_node.rb
index 701833a5d0..61084a8214 100644
--- a/service/lib/agama/dbus/storage/iscsi_node.rb
+++ b/service/lib/agama/dbus/storage/iscsi_node.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2023] SUSE LLC
+# Copyright (c) [2023-2025] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -21,15 +21,12 @@
 
 require "dbus"
 require "agama/dbus/base_object"
-require "agama/dbus/storage/with_iscsi_auth"
 
 module Agama
   module DBus
     module Storage
       # Class representing an iSCSI node
       class ISCSINode < BaseObject
-        include WithISCSIAuth
-
         # @return [Agama::Storage::ISCSI::Manager]
         attr_reader :iscsi_manager
 
@@ -128,12 +125,17 @@ def iscsi_node=(value)
         #   @option Password [String] Password for authentication by target
         #   @option ReverseUsername [String] Username for authentication by initiator
         #   @option ReversePassword [String] Password for authentication by inititator
-        #   @option Startup [String] Valid values are "onboot", "manual", "automatic"
         #
         # @return [Integer] 0 on success, 1 on failure if the given startup value is not valid, and
         #   2 on failure because any other reason.
         def login(options = {})
-          auth = iscsi_auth(options)
+          credentials = {
+            username:           options["Username"],
+            password:           options["Password"],
+            initiator_username: options["ReverseUsername"],
+            initiator_password: options["ReversePassword"]
+          }
+
           startup = options["Startup"]
 
           if startup && !valid_startup?(startup)
@@ -141,7 +143,7 @@ def login(options = {})
             return 1
           end
 
-          success = iscsi_manager.login(iscsi_node, auth, startup: startup)
+          success = iscsi_manager.login(iscsi_node, credentials: credentials, startup: startup)
           return 0 if success
 
           logger.info("iSCSI login error: fail to login iSCSI node #{path}")
diff --git a/service/lib/agama/dbus/storage/manager.rb b/service/lib/agama/dbus/storage/manager.rb
index d17f951d42..7f96b546b9 100644
--- a/service/lib/agama/dbus/storage/manager.rb
+++ b/service/lib/agama/dbus/storage/manager.rb
@@ -33,7 +33,7 @@
 require "agama/dbus/storage/proposal"
 require "agama/dbus/storage/proposal_settings_conversion"
 require "agama/dbus/storage/volume_conversion"
-require "agama/dbus/storage/with_iscsi_auth"
+require "agama/dbus/with_progress"
 require "agama/dbus/with_service_status"
 require "agama/storage/encryption_settings"
 require "agama/storage/proposal_settings"
@@ -46,7 +46,7 @@ module DBus
     module Storage
       # D-Bus object to manage storage installation
       class Manager < BaseObject # rubocop:disable Metrics/ClassLength
-        include WithISCSIAuth
+        include WithProgress
         include WithServiceStatus
         include ::DBus::ObjectManager
         include DBus::Interfaces::Issues
@@ -60,10 +60,12 @@ class Manager < BaseObject # rubocop:disable Metrics/ClassLength
         # Constructor
         #
         # @param backend [Agama::Storage::Manager]
-        # @param logger [Logger]
-        def initialize(backend, logger)
+        # @param service_status [Agama::DBus::ServiceStatus, nil]
+        # @param logger [Logger, nil]
+        def initialize(backend, service_status: nil, logger: nil)
           super(PATH, logger: logger)
           @backend = backend
+          @service_status = service_status
           @encryption_methods = read_encryption_methods
           @actions = read_actions
 
@@ -77,6 +79,10 @@ def initialize(backend, logger)
           add_s390_interfaces if Yast::Arch.s390
         end
 
+        def locale=(locale)
+          backend.locale = locale
+        end
+
         # List of issues, see {DBus::Interfaces::Issues}
         #
         # @return [Array<Agama::Issue>]
@@ -99,14 +105,13 @@ def probe(keep_config: false)
           end
         end
 
+        # @todo Drop support for the guided settings.
+        #
         # Applies the given serialized config according to the JSON schema.
         #
         # The JSON schema supports two different variants:
         # { "storage": ... } or { "legacyAutoyastStorage": ... }.
         #
-        # @note The guided settings ({ "storage": { "guided": ... } }) are supported too, but it
-        #   will be removed from the JSON schema.
-        #
         # @raise If the config is not valid.
         #
         # @param serialized_config [String] Serialized storage config.
@@ -345,7 +350,7 @@ def default_volume(mount_path)
             [default_volume(mount_path)]
           end
 
-          # @todo Receive guided json settings.
+          # @deprecated Use #Storage1.SetConfig
           #
           # result: 0 success; 1 error
           dbus_method(:Calculate, "in settings_dbus:a{sv}, out result:u") do |settings_dbus|
@@ -367,7 +372,7 @@ def initiator_name
         #
         # @param value [String]
         def initiator_name=(value)
-          backend.iscsi.initiator.name = value
+          backend.iscsi.update_initiator(name: value)
         end
 
         # Whether the initiator name was set via iBFT
@@ -385,11 +390,18 @@ def ibft
         #   @option Username [String] Username for authentication by target
         #   @option Password [String] Password for authentication by target
         #   @option ReverseUsername [String] Username for authentication by initiator
-        #   @option ReversePassword [String] Username for authentication by inititator
+        #   @option ReversePassword [String] Password for authentication by inititator
         #
         # @return [Integer] 0 on success, 1 on failure
         def iscsi_discover(address, port, options = {})
-          success = backend.iscsi.discover_send_targets(address, port, iscsi_auth(options))
+          credentials = {
+            username:           options["Username"],
+            password:           options["Password"],
+            initiator_username: options["ReverseUsername"],
+            initiator_password: options["ReversePassword"]
+          }
+
+          success = backend.iscsi.discover(address, port, credentials: credentials)
           success ? 0 : 1
         end
 
@@ -425,10 +437,6 @@ def iscsi_delete(path)
           dbus_method(:Delete, "in node:o, out result:u") { |n| iscsi_delete(n) }
         end
 
-        def locale=(locale)
-          backend.locale = locale
-        end
-
       private
 
         # @return [Agama::Storage::Manager]
@@ -469,16 +477,18 @@ def register_proposal_callbacks
         end
 
         def register_iscsi_callbacks
-          backend.iscsi.on_activate do
-            properties = interfaces_and_properties[ISCSI_INITIATOR_INTERFACE]
-            dbus_properties_changed(ISCSI_INITIATOR_INTERFACE, properties, [])
-          end
-
           backend.iscsi.on_probe do
+            iscsi_initiator_properties_changed
             refresh_iscsi_nodes
           end
 
           backend.iscsi.on_sessions_change do
+            # Currently, the system is set as deprecated instead of reprobing automatically. This
+            # is done so to avoid a reprobing after each single session change performed by the UI.
+            # Clients are expected to request a reprobing if they detect a deprecated system.
+            #
+            # If the UI is adapted to use the new iSCSI API (i.e., #SetConfig), then this behaviour
+            # should be reevaluated. Ideally, the system would be reprobed if the sessions change.
             deprecate_system
           end
         end
@@ -500,6 +510,11 @@ def proposal_properties_changed
           dbus_properties_changed(PROPOSAL_CALCULATOR_INTERFACE, properties, [])
         end
 
+        def iscsi_initiator_properties_changed
+          properties = interfaces_and_properties[ISCSI_INITIATOR_INTERFACE]
+          dbus_properties_changed(ISCSI_INITIATOR_INTERFACE, properties, [])
+        end
+
         def deprecate_system
           backend.deprecated_system = true
         end
diff --git a/service/lib/agama/dbus/storage/with_iscsi_auth.rb b/service/lib/agama/dbus/storage/with_iscsi_auth.rb
deleted file mode 100644
index 6533612d92..0000000000
--- a/service/lib/agama/dbus/storage/with_iscsi_auth.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright (c) [2023] SUSE LLC
-#
-# All Rights Reserved.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of version 2 of the GNU General Public License as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-# more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, contact SUSE LLC.
-#
-# To contact SUSE LLC about this file by physical or electronic mail, you may
-# find current contact information at www.suse.com.
-
-require "y2iscsi_client/authentication"
-
-module Agama
-  module DBus
-    module Storage
-      # Mixin for creating an iSCSI authentication object from D-Bus options
-      module WithISCSIAuth
-        # Creates an iSCSI authentication object
-        #
-        # @param dbus_options [Hash<String, String>] Options from a D-Bus call:
-        #   @option Username [String] Username for authentication by target
-        #   @option Password [String] Password for authentication by target
-        #   @option ReverseUsername [String] Username for authentication by initiator
-        #   @option ReversePassword [String] Username for authentication by inititator
-        #
-        # @return [Y2IscsiClient::Authentication]
-        def iscsi_auth(dbus_options)
-          Y2IscsiClient::Authentication.new.tap do |auth|
-            auth.username = dbus_options["Username"]
-            auth.password = dbus_options["Password"]
-            auth.username_in = dbus_options["ReverseUsername"]
-            auth.password_in = dbus_options["ReversePassword"]
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/service/lib/agama/dbus/storage_service.rb b/service/lib/agama/dbus/storage_service.rb
index f4ee03f1ba..a17b4bf140 100644
--- a/service/lib/agama/dbus/storage_service.rb
+++ b/service/lib/agama/dbus/storage_service.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2022-2023] SUSE LLC
+# Copyright (c) [2022-2025] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -22,7 +22,9 @@
 require "dbus"
 require "agama/dbus/bus"
 require "agama/dbus/clients/locale"
-require "agama/dbus/storage"
+require "agama/dbus/service_status"
+require "agama/dbus/storage/iscsi"
+require "agama/dbus/storage/manager"
 require "agama/storage"
 
 module Agama
@@ -74,10 +76,6 @@ def dispatch
       # @return [Logger]
       attr_reader :logger
 
-      def manager
-        @manager ||= Agama::Storage::Manager.new(config, logger)
-      end
-
       # @return [::DBus::ObjectServer]
       def service
         @service ||= bus.request_service(SERVICE_NAME)
@@ -85,7 +83,36 @@ def service
 
       # @return [Array<::DBus::Object>]
       def dbus_objects
-        @dbus_objects ||= [Agama::DBus::Storage::Manager.new(manager, logger)]
+        @dbus_objects ||= [manager_object, iscsi_object]
+      end
+
+      # @return [Agama::DBus::Storage::Manager]
+      def manager_object
+        @manager_object ||= Agama::DBus::Storage::Manager.new(
+          manager,
+          service_status: service_status,
+          logger:         logger
+        )
+      end
+
+      # @return [Agama::DBus::Storage::ISCSI]
+      def iscsi_object
+        # Uses the same service status as the manager D-Bus object.
+        @iscsi_object ||= Agama::DBus::Storage::ISCSI.new(
+          manager.iscsi,
+          service_status: service_status,
+          logger:         logger
+        )
+      end
+
+      # @return [Agama::Storage::Manager]
+      def manager
+        @manager ||= Agama::Storage::Manager.new(config, logger: logger)
+      end
+
+      # @return [Agama::DBus::ServiceStatus]
+      def service_status
+        @service_status ||= Agama::DBus::ServiceStatus.new
       end
     end
   end
diff --git a/service/lib/agama/dbus/with_progress.rb b/service/lib/agama/dbus/with_progress.rb
new file mode 100644
index 0000000000..552de83822
--- /dev/null
+++ b/service/lib/agama/dbus/with_progress.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+# Copyright (c) [2025] SUSE LLC
+#
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of version 2 of the GNU General Public License as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE LLC about this file by physical or electronic mail, you may
+# find current contact information at www.suse.com.
+
+module Agama
+  module DBus
+    # Mixin to be included by D-Bus objects that need to register progress.
+    module WithProgress
+      # TODO: make D-Bus objects to own a ProgressManager instance instead of getting it from the
+      #   backend instance.
+      #
+      # @return [Agama::ProgressManager]
+      def progress_manager
+        backend.progress_manager
+      end
+
+      # @return [Agama::Progress, nil]
+      def progress
+        progress_manager.progress
+      end
+    end
+  end
+end
diff --git a/service/lib/agama/dbus/with_service_status.rb b/service/lib/agama/dbus/with_service_status.rb
index 2962e36dbe..1e9cb169fd 100644
--- a/service/lib/agama/dbus/with_service_status.rb
+++ b/service/lib/agama/dbus/with_service_status.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2022] SUSE LLC
+# Copyright (c) [2022-2025] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -23,7 +23,7 @@
 
 module Agama
   module DBus
-    # Mixin to be included by D-Bus objects that needs to register a service status
+    # Mixin to be included by D-Bus objects that needs to register a service status.
     module WithServiceStatus
       # Service status
       #
@@ -37,10 +37,7 @@ def service_status
       # @param block [Proc]
       # @return [Object] the result of the given block
       def busy_while(&block)
-        service_status.busy
-        block.call
-      ensure
-        service_status.idle
+        service_status.busy_while(&block)
       end
     end
   end
diff --git a/service/lib/agama/json_importer.rb b/service/lib/agama/json_importer.rb
new file mode 100644
index 0000000000..2a7e448a3e
--- /dev/null
+++ b/service/lib/agama/json_importer.rb
@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+# Copyright (c) [2025] SUSE LLC
+#
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of version 2 of the GNU General Public License as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE LLC about this file by physical or electronic mail, you may
+# find current contact information at www.suse.com.
+
+module Agama
+  # Base class for generating a target object from a JSON.
+  class JSONImporter
+    # @param json [Hash]
+    def initialize(json)
+      @json = json
+    end
+
+    # Performs the conversion from Hash according to the JSON schema.
+    #
+    # @return [Object] A {Config} or any its configs from {Storage::Configs}.
+    def import
+      result = target
+
+      imports.each do |property, value|
+        next if value.nil?
+
+        result.public_send("#{property}=", value)
+      end
+
+      result
+    end
+
+  private
+
+    # @return [Hash]
+    attr_reader :json
+
+    # Target object (defined by derived classes).
+    #
+    # @return [Object]
+    def target
+      raise "Undefined target object"
+    end
+
+    # Imported properties.
+    #
+    # @return [Hash] e.g., { foo: 10, bar: nil }.
+    def imports
+      {}
+    end
+  end
+end
diff --git a/service/lib/agama/progress_manager.rb b/service/lib/agama/progress_manager.rb
new file mode 100644
index 0000000000..85d5b2f401
--- /dev/null
+++ b/service/lib/agama/progress_manager.rb
@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+
+# Copyright (c) [2025] SUSE LLC
+#
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of version 2 of the GNU General Public License as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE LLC about this file by physical or electronic mail, you may
+# find current contact information at www.suse.com.
+
+require "agama/progress"
+
+module Agama
+  # There is an unfinished progress.
+  class NotFinishedProgress < StandardError; end
+
+  # Class for managing the progress.
+  class ProgressManager
+    # @return [Progress, nil]
+    attr_reader :progress
+
+    def initialize
+      @on_change_callbacks = []
+      @on_finish_callbacks = []
+    end
+
+    # Creates a new progress with a given number of steps.
+    #
+    # @param size [Integer] Number of steps.
+    def start_with_size(size)
+      start_progress(size: size)
+    end
+
+    # Creates a new progress with a given set of steps.
+    #
+    # @param descriptions [Array<String>] Steps descriptions.
+    def start_with_descriptions(*descriptions)
+      start_progress(descriptions: descriptions)
+    end
+
+    # Finishes the current progress.
+    def finish
+      return if progress.nil? || progress.finished?
+
+      progress.finish
+    end
+
+    # Registers an on_change callback to be added to the progress.
+    #
+    # @param block [Proc]
+    def on_change(&block)
+      @on_change_callbacks << block
+    end
+
+    # Registers an on_finish callback to be added to the progress.
+    #
+    # @param block [Proc]
+    def on_finish(&block)
+      @on_finish_callbacks << block
+    end
+
+  private
+
+    # @return [Array<Proc>]
+    attr_reader :on_change_callbacks
+
+    # @return [Array<Proc>]
+    attr_reader :on_finish_callbacks
+
+    # Creates a new progress.
+    #
+    # @raise [RuntimeError] if there is an unfinished progress.
+    #
+    # @param args [*Hash] Progress constructor arguments.
+    def start_progress(args)
+      raise NotFinishedProgress if progress && !progress.finished?
+
+      @progress = Progress.new(**args).tap do |progress|
+        progress.on_change { on_change_callbacks.each(&:call) }
+        progress.on_finish { on_finish_callbacks.each(&:call) }
+      end
+    end
+  end
+end
diff --git a/service/lib/agama/software/manager.rb b/service/lib/agama/software/manager.rb
index e0e7a6705b..707998599e 100644
--- a/service/lib/agama/software/manager.rb
+++ b/service/lib/agama/software/manager.rb
@@ -202,7 +202,7 @@ def install
         end
 
         logger.info "Commit result #{commit_result}"
-      rescue Agama::WithProgress::NotFinishedProgress => e
+      rescue Agama::NotFinishedProgress => e
         logger.error "There is an unfinished progress: #{e.inspect}"
         finish_progress
       end
diff --git a/service/lib/agama/storage/finisher.rb b/service/lib/agama/storage/finisher.rb
index a62d460523..8d63950556 100644
--- a/service/lib/agama/storage/finisher.rb
+++ b/service/lib/agama/storage/finisher.rb
@@ -53,6 +53,8 @@ def initialize(logger, config, security)
 
       # Execute the final storage actions, reporting the progress
       def run
+        # FIXME: This progress is not emitting changes in D-Bus because its callbacks are not
+        #   configured. Is that expected? If so, why a progress?
         steps = possible_steps.select(&:run?)
         start_progress_with_size(steps.size)
 
diff --git a/service/lib/agama/storage/iscsi/adapter.rb b/service/lib/agama/storage/iscsi/adapter.rb
new file mode 100644
index 0000000000..63dde34a0b
--- /dev/null
+++ b/service/lib/agama/storage/iscsi/adapter.rb
@@ -0,0 +1,209 @@
+# frozen_string_literal: true
+
+# Copyright (c) [2025] SUSE LLC
+#
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of version 2 of the GNU General Public License as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE LLC about this file by physical or electronic mail, you may
+# find current contact information at www.suse.com.
+
+require "agama/storage/iscsi/initiator"
+require "agama/storage/iscsi/node"
+require "yast"
+require "y2iscsi_client/authentication"
+
+Yast.import "IscsiClientLib"
+
+module Agama
+  module Storage
+    module ISCSI
+      # This class is a wrapper over the YaST code dealing with iSCSI.
+      class Adapter
+        # Performs actions for activating iSCSI.
+        def activate
+          Yast::IscsiClientLib.getiBFT
+          # Check initiator name, creating one if missing.
+          return false unless Yast::IscsiClientLib.checkInitiatorName(silent: true)
+
+          # Why we need to sleep here? This was copied from yast2-iscsi-client.
+          sleep(0.5)
+          Yast::IscsiClientLib.getConfig
+          Yast::IscsiClientLib.autoLogOn
+        end
+
+        # Performs an iSCSI discovery.
+        #
+        # Based on provided address and port, ie. assuming ISNS is not used. Since YaST do not offer
+        # UI to configure ISNS during installation, we are assuming it's not supported.
+        #
+        # @param host [String] IP address.
+        # @param port [Integer]
+        # @param credentials [Hash<Symbol, String>]
+        #   @option username [String]
+        #   @option password [String]
+        #   @option initiator_username [String]
+        #   @option initiator_password [String]
+        #
+        # @return [Boolean] Whether the action successes
+        def discover(host, port, credentials: {})
+          Yast::IscsiClientLib.discover(host, port, authentication(credentials), silent: true)
+        end
+
+        # Reads the iSCSI initiator config.
+        # @return [Initiator]
+        def read_initiator
+          Initiator.new.tap do |initiator|
+            initiator.name = Yast::IscsiClientLib.initiatorname
+            initiator.offload_card = Yast::IscsiClientLib.GetOffloadCard()
+            initiator.ibft_name = !Yast::IscsiClientLib.getiBFT.fetch("iSCSI_INITIATOR_NAME", "")
+              .empty?
+          end
+        end
+
+        # Updates the initiator info.
+        #
+        # @param initiator [Initiator]
+        # @param name [String, nil]
+        # @param offload_card [String, nil]
+        def update_initiator(initiator, name: nil, offload_card: nil)
+          update_name = name && name != initiator.name
+          update_offload_card = offload_card && offload_card != initiator.offload_card
+
+          Yast::IscsiClientLib.writeInitiatorName(name) if update_name
+          Yast::IscsiClientLib.SetOffloadCard(offload_card) if update_offload_card
+        end
+
+        # Reads the discovered iSCSI nodes.
+        # @return [Array<Node>]
+        def read_nodes
+          Yast::IscsiClientLib.readSessions
+          Yast::IscsiClientLib.getDiscovered.map { |t| node_from(t.split) }
+        end
+
+        # Creates a new iSCSI session.
+        #
+        # @param node [Node]
+        # @param credentials [Hash<Symbol, String>]
+        #   @option username [String]
+        #   @option password [String]
+        #   @option initiator_username [String]
+        #   @option initiator_password [String]
+        # @param startup [String, nil]
+        #
+        # @return [Boolean] Whether the action successes.
+        def login(node, credentials: {}, startup: nil)
+          startup ||= Yast::IscsiClientLib.default_startup_status
+
+          Yast::IscsiClientLib.currentRecord = record_from(node)
+          Yast::IscsiClientLib.login_into_current(authentication(credentials), silent: true) &&
+            Yast::IscsiClientLib.setStartupStatus(startup)
+        end
+
+        # Closes an iSCSI session.
+        #
+        # @param node [Node]
+        # @return [Boolean] Whether the action successes.
+        def logout(node)
+          Yast::IscsiClientLib.currentRecord = record_from(node)
+          # Yes, this is the correct method name for logging out
+          Yast::IscsiClientLib.deleteRecord
+        end
+
+        # Deletes an iSCSI node from the database.
+        #
+        # @param node [Node]
+        # @return [Boolean] Whether the action successes
+        def delete_node(node)
+          Yast::IscsiClientLib.currentRecord = record_from(node)
+          Yast::IscsiClientLib.removeRecord
+        end
+
+        # Updates an iSCSI node.
+        #
+        # @param node [Node]
+        # @param startup [String] New startup mode value.
+        #
+        # @return [Boolean] Whether the action successes.
+        def update_node(node, startup:)
+          Yast::IscsiClientLib.currentRecord = record_from(node)
+          Yast::IscsiClientLib.setStartupStatus(startup)
+        end
+
+      private
+
+        # Creates an iSCSI authentication object.
+        #
+        # @param credentials [Hash<Symbole, String>]
+        #   @option username [String] Username for authentication by target
+        #   @option password [String] Password for authentication by target
+        #   @option initiator_username [String] Username for authentication by initiator
+        #   @option initiator_password [String] Password for authentication by inititator
+        #
+        # @return [Y2IscsiClient::Authentication]
+        def authentication(credentials)
+          Y2IscsiClient::Authentication.new.tap do |auth|
+            auth.username = credentials[:username]
+            auth.password = credentials[:password]
+            auth.username_in = credentials[:initiator_username]
+            auth.password_in = credentials[:initiator_password]
+          end
+        end
+
+        # Creates a node from the record provided by YaST.
+        #
+        # @param record [Array] Contains portal, target and interface of the iSCSI node.
+        # @return [Node]
+        def node_from(record)
+          ISCSI::Node.new.tap do |node|
+            node.portal = record[0]
+            node.target = record[1]
+            node.interface = record[2] || "default"
+            node.connected = false
+
+            Yast::IscsiClientLib.currentRecord = record
+            node.ibtf = Yast::IscsiClientLib.iBFT?(Yast::IscsiClientLib.getCurrentNodeValues)
+
+            session_record = find_session_for(record)
+
+            if session_record
+              node.connected = true
+              # FIXME: the calculation of both startup and ibft imply executing getCurrentNodeValues
+              # (ie. calling iscsiadm)
+              Yast::IscsiClientLib.currentRecord = session_record
+              node.startup = Yast::IscsiClientLib.getStartupStatus
+            end
+          end
+        end
+
+        # Finds a session for the given iSCSI record.
+        #
+        # @param record [Array] Contains portal, target and interface of the iSCSI node.
+        # @return [Array, nil] Record for the iSCSI session.
+        def find_session_for(record)
+          Yast::IscsiClientLib.currentRecord = record
+          Yast::IscsiClientLib.find_session(true)&.split
+        end
+
+        # Generates a YaST record from a node.
+        #
+        # @param node [Node]
+        # @return [Array]
+        def record_from(node)
+          [node.portal, node.target, node.interface]
+        end
+      end
+    end
+  end
+end
diff --git a/service/lib/agama/storage/iscsi/config.rb b/service/lib/agama/storage/iscsi/config.rb
new file mode 100644
index 0000000000..e7a4e03004
--- /dev/null
+++ b/service/lib/agama/storage/iscsi/config.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+# Copyright (c) [2025] SUSE LLC
+#
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of version 2 of the GNU General Public License as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE LLC about this file by physical or electronic mail, you may
+# find current contact information at www.suse.com.
+
+module Agama
+  module Storage
+    module ISCSI
+      # iSCSI config.
+      class Config
+        # Initiator name.
+        #
+        # @return [String, nil]
+        attr_accessor :initiator
+
+        # List of targets.
+        #
+        # @return [Array<Configs::Target>, nil] If nil, then targets are not configured.
+        attr_accessor :targets
+      end
+    end
+  end
+end
diff --git a/service/lib/agama/storage/iscsi/config_importer.rb b/service/lib/agama/storage/iscsi/config_importer.rb
new file mode 100644
index 0000000000..2b3a8f26d0
--- /dev/null
+++ b/service/lib/agama/storage/iscsi/config_importer.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+# Copyright (c) [2025] SUSE LLC
+#
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of version 2 of the GNU General Public License as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE LLC about this file by physical or electronic mail, you may
+# find current contact information at www.suse.com.
+
+require "agama/json_importer"
+require "agama/storage/iscsi/config"
+require "agama/storage/iscsi/config_importers/target"
+
+module Agama
+  module Storage
+    module ISCSI
+      # Class for generating an iSCSI config object from a JSON.
+      class ConfigImporter < JSONImporter
+        # @return [Config]
+        def target
+          Config.new
+        end
+
+        # @see Agama::JSONImporter#imports
+        def imports
+          {
+            initiator: json[:initiator],
+            targets:   import_iscsi_targets
+          }
+        end
+
+        def import_iscsi_targets
+          targets_json = json[:targets]
+          return unless targets_json
+
+          targets_json.map { |t| ConfigImporters::Target.new(t).import }
+        end
+      end
+    end
+  end
+end
diff --git a/service/lib/agama/storage/iscsi/config_importers.rb b/service/lib/agama/storage/iscsi/config_importers.rb
new file mode 100644
index 0000000000..9ac104d32f
--- /dev/null
+++ b/service/lib/agama/storage/iscsi/config_importers.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+# Copyright (c) [2025] SUSE LLC
+#
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of version 2 of the GNU General Public License as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE LLC about this file by physical or electronic mail, you may
+# find current contact information at www.suse.com.
+
+module Agama
+  module Storage
+    module ISCSI
+      # Namespace for iSCSI config importers.
+      module ConfigImporters
+      end
+    end
+  end
+end
+
+require "agama/storage/iscsi/config_importers/target"
diff --git a/service/lib/agama/storage/iscsi/config_importers/target.rb b/service/lib/agama/storage/iscsi/config_importers/target.rb
new file mode 100644
index 0000000000..f4f19dbb86
--- /dev/null
+++ b/service/lib/agama/storage/iscsi/config_importers/target.rb
@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+# Copyright (c) [2025] SUSE LLC
+#
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of version 2 of the GNU General Public License as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE LLC about this file by physical or electronic mail, you may
+# find current contact information at www.suse.com.
+
+require "agama/json_importer"
+require "agama/storage/iscsi/configs/target"
+
+module Agama
+  module Storage
+    module ISCSI
+      module ConfigImporters
+        # Class for generating an iSCSI target object from a JSON.
+        class Target < JSONImporter
+          # @return [Configs::Target]
+          def target
+            Configs::Target.new
+          end
+
+          # @see Agama::JSONImporter#imports
+          def imports
+            {
+              address:            json[:address],
+              port:               json[:port],
+              name:               json[:name],
+              interface:          json[:interface],
+              startup:            json[:startup],
+              username:           json.dig(:authByTarget, :username),
+              password:           json.dig(:authByTarget, :password),
+              initiator_username: json.dig(:authByInitiator, :username),
+              initiator_password: json.dig(:authByInitiator, :password)
+            }
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/service/lib/agama/storage/iscsi/configs.rb b/service/lib/agama/storage/iscsi/configs.rb
new file mode 100644
index 0000000000..62bc111281
--- /dev/null
+++ b/service/lib/agama/storage/iscsi/configs.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+# Copyright (c) [2025] SUSE LLC
+#
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of version 2 of the GNU General Public License as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE LLC about this file by physical or electronic mail, you may
+# find current contact information at www.suse.com.
+
+module Agama
+  module Storage
+    module ISCSI
+      # Namespace for the iSCSI settings.
+      module Configs
+      end
+    end
+  end
+end
+
+require "agama/storage/iscsi/configs/target"
diff --git a/service/lib/agama/storage/iscsi/configs/target.rb b/service/lib/agama/storage/iscsi/configs/target.rb
new file mode 100644
index 0000000000..b1674b12da
--- /dev/null
+++ b/service/lib/agama/storage/iscsi/configs/target.rb
@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+# Copyright (c) [2025] SUSE LLC
+#
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of version 2 of the GNU General Public License as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE LLC about this file by physical or electronic mail, you may
+# find current contact information at www.suse.com.
+
+module Agama
+  module Storage
+    module ISCSI
+      module Configs
+        # iSCSI target config.
+        class Target
+          # Target IP address.
+          #
+          # @return [String, nil]
+          attr_accessor :address
+
+          # Target port.
+          #
+          # @return [Integer, nl]
+          attr_accessor :port
+
+          # Target name.
+          #
+          # @return [String, nil]
+          attr_accessor :name
+
+          # Target interface.
+          #
+          # @return [String, nil]
+          attr_accessor :interface
+
+          # Startup mode.
+          #
+          # @return [String, nil]
+          attr_accessor :startup
+
+          # Username for authentication by target.
+          #
+          # @return [String, nil]
+          attr_accessor :username
+
+          # Password for authentication by target
+          #
+          # @return [String, nil]
+          attr_accessor :password
+
+          # Username for authentication by initiator.
+          #
+          # @return [String, nil]
+          attr_accessor :initiator_username
+
+          # Password for authentication by initiator.
+          #
+          # @return [String, nil]
+          attr_accessor :initiator_password
+        end
+      end
+    end
+  end
+end
diff --git a/service/lib/agama/storage/iscsi/initiator.rb b/service/lib/agama/storage/iscsi/initiator.rb
index 26bfe1104b..a92d2c8a09 100644
--- a/service/lib/agama/storage/iscsi/initiator.rb
+++ b/service/lib/agama/storage/iscsi/initiator.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2023] SUSE LLC
+# Copyright (c) [2023-2025] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -19,53 +19,26 @@
 # To contact SUSE LLC about this file by physical or electronic mail, you may
 # find current contact information at www.suse.com.
 
-Yast.import "IscsiClientLib"
-
 module Agama
   module Storage
     module ISCSI
       # Class representing an open-iscsi initiator
-      #
-      # This class is a wrapper for YaST code dealing with the iSCSI initiator. Note that the YaST
-      # code uses a singleton module, so different instances of this class always represent the very
-      # same iSCSI initiator configured by YaST.
       class Initiator
         # Initiator name
         #
         # @return [String]
-        def name
-          Yast::IscsiClientLib.initiatorname
-        end
-
-        # Sets the inititator name
-        #
-        # @param value [String]
-        def name=(value)
-          return if Yast::IscsiClientLib.initiatorname == value
-
-          Yast::IscsiClientLib.writeInitiatorName(value)
-        end
+        attr_accessor :name
 
         # Configured iSCSI offload card
         #
         # @return [String]
-        def offload_card
-          Yast::IscsiClientLib.GetOffloadCard()
-        end
-
-        # Sets the iSCSI offload card
-        #
-        # @param value [String]
-        def offload_card=(value)
-          Yast::IscsiClientLib.SetOffloadCard(value)
-        end
+        attr_accessor :offload_card
 
         # Whether the initiator name was set via iBFT
         #
         # @return [Boolean]
-        def ibft_name?
-          !Yast::IscsiClientLib.getiBFT.fetch("iSCSI_INITIATOR_NAME", "").empty?
-        end
+        attr_accessor :ibft_name
+        alias_method :ibft_name?, :ibft_name
       end
     end
   end
diff --git a/service/lib/agama/storage/iscsi/manager.rb b/service/lib/agama/storage/iscsi/manager.rb
index d68067b07f..e39d1d592a 100644
--- a/service/lib/agama/storage/iscsi/manager.rb
+++ b/service/lib/agama/storage/iscsi/manager.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2023] SUSE LLC
+# Copyright (c) [2023-2025] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -19,159 +19,162 @@
 # To contact SUSE LLC about this file by physical or electronic mail, you may
 # find current contact information at www.suse.com.
 
-require "yast"
+require "agama/issue"
+require "agama/storage/iscsi/adapter"
+require "agama/storage/iscsi/config_importer"
 require "agama/storage/iscsi/node"
-require "agama/storage/iscsi/initiator"
-
-Yast.import "IscsiClientLib"
+require "agama/with_issues"
+require "agama/with_progress"
+require "yast/i18n"
 
 module Agama
   module Storage
     module ISCSI
-      # Manager for iSCSI
+      # Manager for iSCSI.
       class Manager
+        include WithIssues
+        include WithProgress
+        include Yast::I18n
+
         STARTUP_OPTIONS = ["onboot", "manual", "automatic"].freeze
 
-        # iSCSI initiator
+        # Config according to the JSON schema.
+        #
+        # @return [Hash, nil]
+        attr_reader :config_json
+
+        # iSCSI initiator.
         #
-        # @return [Initiator]
+        # @return [Initiator, nil]
         attr_reader :initiator
 
-        # Discovered iSCSI nodes
+        # Discovered iSCSI nodes.
         #
         # @return [Array<Node>]
         attr_reader :nodes
 
-        # Constructor
-        #
+        # @param progress_manager [ProgressManager, nil]
         # @param logger [Logger, nil]
-        def initialize(logger: nil)
+        def initialize(progress_manager: nil, logger: nil)
+          @progress_manager = progress_manager
           @logger = logger || ::Logger.new($stdout)
-          @initiator = ISCSI::Initiator.new
-
+          @nodes = []
           @on_activate_callbacks = []
           @on_probe_callbacks = []
           @on_sessions_change_callbacks = []
         end
 
-        # Performs actions for activating iSCSI
+        # Performs actions for activating iSCSI.
+        #
+        # Callbacks are called at the end, see {#on_probe}.
         def activate
           logger.info "Activating iSCSI"
           @activated = true
-
-          Yast::IscsiClientLib.getiBFT
-          # Check initiator name, creating one if missing
-          return false unless Yast::IscsiClientLib.checkInitiatorName(silent: true)
-
-          # Why we need to sleep here? This was copied from yast2-iscsi-client.
-          sleep(0.5)
-          Yast::IscsiClientLib.getConfig
-          Yast::IscsiClientLib.autoLogOn
-
+          adapter.activate
           @on_activate_callbacks.each(&:call)
         end
 
-        # Probes iSCSI
+        # Performs an iSCSI discovery.
+        # @note iSCSI nodes are probed again, see {#probe_after}.
+        #
+        # @param host [String] IP address
+        # @param port [Integer]
+        # @param credentials [Hash<Symbol, String>]
+        #   @option username [String]
+        #   @option password [String]
+        #   @option initiator_username [String]
+        #   @option initiator_password [String]
+        #
+        # @return [Boolean] Whether the action successes
+        def discover(host, port, credentials: {})
+          ensure_activated
+          probe_after { adapter.discover(host, port, credentials: credentials) }
+        end
+
+        # Probes iSCSI.
         #
         # Callbacks are called at the end, see {#on_probe}.
         def probe
           logger.info "Probing iSCSI"
-
-          Yast::IscsiClientLib.readSessions
-          @nodes = Yast::IscsiClientLib.getDiscovered.map { |t| node_from(t.split) }
-
+          @probed = true
+          probe_initiator
+          probe_nodes
           @on_probe_callbacks.each(&:call)
         end
 
-        # Performs an iSCSI discovery
-        #
-        # Based on provided address and port, ie. assuming ISNS is not used. Since YaST do not offer
-        # UI to configure ISNS during installation, we are assuming it's not supported.
+        # Applies the given iSCSI config.
         #
-        # @note iSCSI nodes are probed again, see {#probe_after}.
-        #
-        # @param host [String] IP address
-        # @param port [Integer]
-        # @param authentication [Y2IscsiClient::Authentication]
-        #
-        # @return [Boolean] Whether the action successes
-        def discover_send_targets(host, port, authentication)
-          ensure_activated
+        # @param config_json [Hash{Symbol=>Object}] Config according to the JSON schema.
+        # @return [Boolean] Whether the config was correctly applied.
+        def apply_config_json(config_json)
+          @config_json = config_json
+          config = ConfigImporter.new(config_json).import
 
-          probe_after do
-            Yast::IscsiClientLib.discover(host, port, authentication, silent: true)
-          end
+          success = probe_after { apply_config(config) }
+          run_on_sessions_change_callbacks if config.targets
+
+          success
         end
 
-        # Creates a new iSCSI session
+        # Updates the initiator info.
         #
+        # @param name [String, nil]
+        # @param offload_card [String, nil]
+        def update_initiator(name: nil, offload_card: nil)
+          return unless initiator
+
+          adapter.update_initiator(initiator, name: name, offload_card: offload_card)
+          probe_initiator
+        end
+
+        # Creates a new iSCSI session.
         # @note iSCSI nodes are probed again, see {#probe_after}.
         #
         # @param node [Node]
-        # @param authentication [Y2IscsiClient::Authentication]
+        # @param credentials [Hash<Symbol, String>]
+        #   @option username [String]
+        #   @option password [String]
+        #   @option initiator_username [String]
+        #   @option initiator_password [String]
         # @param startup [String, nil] Startup status
         #
         # @return [Boolean] Whether the action successes
-        def login(node, authentication, startup: nil)
-          startup ||= Yast::IscsiClientLib.default_startup_status
-
+        def login(node, credentials: {}, startup: nil)
           ensure_activated
-
-          result = probe_after do
-            Yast::IscsiClientLib.currentRecord = record_from(node)
-            Yast::IscsiClientLib.login_into_current(authentication, silent: true) &&
-              Yast::IscsiClientLib.setStartupStatus(startup)
-          end
-
+          result = probe_after { adapter.login(node, credentials: credentials, startup: startup) }
           run_on_sessions_change_callbacks
           result
         end
 
-        # Closes an iSCSI session
-        #
+        # Closes an iSCSI session.
         # @note iSCSI nodes are probed again, see {#probe_after}.
         #
         # @param node [Node]
         # @return [Boolean] Whether the action successes
         def logout(node)
           ensure_activated
-
-          result = probe_after do
-            Yast::IscsiClientLib.currentRecord = record_from(node)
-            # Yes, this is the correct method name for logging out
-            Yast::IscsiClientLib.deleteRecord
-          end
-
+          result = probe_after { adapter.logout(node) }
           run_on_sessions_change_callbacks
           result
         end
 
-        # Deletes an iSCSI node from the database
-        #
+        # Deletes an iSCSI node from the database.
         # @note iSCSI nodes are probed again, see {#probe_after}.
         #
         # @param node [Node]
         # @return [Boolean] Whether the action successes
         def delete(node)
-          probe_after do
-            Yast::IscsiClientLib.currentRecord = record_from(node)
-            Yast::IscsiClientLib.removeRecord
-          end
+          probe_after { adapter.delete_node(node) }
         end
 
-        # Updates an iSCSI node
-        #
-        # @note iSCSI nodes are probed again, see {#probe_after}.
+        # Updates an iSCSI node.
         #
         # @param node [Node]
         # @param startup [String] New startup mode value
         #
         # @return [Boolean] Whether the action successes
         def update(node, startup:)
-          probe_after do
-            Yast::IscsiClientLib.currentRecord = record_from(node)
-            Yast::IscsiClientLib.setStartupStatus(startup)
-          end
+          probe_after { adapter.update_node(node, startup: startup) }
         end
 
         # Registers a callback to be called after performing iSCSI activation
@@ -200,9 +203,9 @@ def on_sessions_change(&block)
         # @return [Logger]
         attr_reader :logger
 
-        # Calls activation if needed
-        def ensure_activated
-          activate unless activated?
+        # @return [Adapter]
+        def adapter
+          @adapter ||= Adapter.new
         end
 
         # Whether activation has been already performed
@@ -212,47 +215,36 @@ def activated?
           !!@activated
         end
 
-        # Creates a node from the record provided by YaST
+        # Whether probing has been already performed.
         #
-        # @param record [Array] Contains portal, target and interface of the iSCSI node.
-        # @return [Node]
-        def node_from(record)
-          ISCSI::Node.new.tap do |node|
-            node.portal = record[0]
-            node.target = record[1]
-            node.interface = record[2] || "default"
-            node.connected = false
-
-            Yast::IscsiClientLib.currentRecord = record
-            node.ibtf = Yast::IscsiClientLib.iBFT?(Yast::IscsiClientLib.getCurrentNodeValues)
-
-            session_record = find_session_for(record)
-
-            if session_record
-              node.connected = true
-              # FIXME: the calculation of both startup and ibft imply executing getCurrentNodeValues
-              # (ie. calling iscsiadm)
-              Yast::IscsiClientLib.currentRecord = session_record
-              node.startup = Yast::IscsiClientLib.getStartupStatus
-            end
-          end
+        # @return [Boolean]
+        def probed?
+          !!@probed
+        end
+
+        # Calls activation if needed
+        def ensure_activated
+          activate unless activated?
+        end
+
+        # Calls probing (and activation) if needed.
+        def ensure_probed
+          activate unless activated?
+          probe unless probed?
         end
 
-        # Generates a YaST record from a node
+        # Probes the initiator.
         #
-        # @param node [Node]
-        # @return [Array]
-        def record_from(node)
-          [node.portal, node.target, node.interface]
+        # @return [ISCSI::Initiator]
+        def probe_initiator
+          @initiator = adapter.read_initiator
         end
 
-        # Finds a session for the given iSCSI record
+        # Probes the iSCSI nodes (a.k.a., targets).
         #
-        # @param record [Array] Contains portal, target and interface of the iSCSI node.
-        # @return [Array, nil] Record for the iSCSI session
-        def find_session_for(record)
-          Yast::IscsiClientLib.currentRecord = record
-          Yast::IscsiClientLib.find_session(true)&.split
+        # @return [Array<ISCSI::Node>]
+        def probe_nodes
+          @nodes = adapter.read_nodes
         end
 
         # Calls the given block and performs iSCSI probing afterwards
@@ -267,6 +259,95 @@ def probe_after(&block)
         def run_on_sessions_change_callbacks
           @on_sessions_change_callbacks.each(&:call)
         end
+
+        # Applies the given iSCSI config.
+        #
+        # @param config [ISCSI::Config]
+        # @return [Boolean] Whether the config was correctly applied.
+        def apply_config(config)
+          ensure_probed
+          apply_initiator_config(config)
+          apply_targets_config(config)
+
+          issues.none?
+        end
+
+        # Applies the inititator config.
+        #
+        # @param config [ISCSI::Config]
+        def apply_initiator_config(config)
+          return unless initiator && config.initiator
+          return if initiator.name == config.initiator
+
+          adapter.update_initiator(initiator, name: config.initiator)
+        end
+
+        # Applies the target configs.
+        #
+        # @param config [ISCSI::Config]
+        def apply_targets_config(config)
+          return unless config.targets
+
+          start_progress_with_size(2)
+          progress.step(_("Logout iSCSI targets")) { logout_targets }
+          progress.step(_("Login iSCSI targets")) { login_targets(config.targets) }
+        end
+
+        # Tries to logout from all targets (nodes).
+        def logout_targets
+          nodes.select(&:connected?).each { |n| adapter.logout(n) }
+        end
+
+        # Tries to login to all given targets.
+        #
+        # @note If the login of a target fails, then an issue is generated. The process stops on
+        #   the first failing login.
+        #
+        # @param targets [Array<ISCSI::Config::Target>]
+        def login_targets(targets)
+          issues = []
+
+          targets.each do |target|
+            success = apply_target_config(target)
+            if !success
+              issues << login_issue(target)
+              break
+            end
+          end
+
+          self.issues = issues
+        end
+
+        # Applies the given target config.
+        #
+        # @param target [ISCSI::Configs::Target]
+        # @return [Boolean] Whether the config was correctly applied.
+        def apply_target_config(target)
+          node = ISCSI::Node.new
+          node.address = target.address
+          node.port = target.port
+          node.target = target.name
+          node.interface = target.interface
+
+          credentials = {
+            username:           target.username,
+            password:           target.password,
+            initiator_username: target.initiator_username,
+            initiator_password: target.initiator_password
+          }
+
+          adapter.login(node, credentials: credentials, startup: target.startup)
+        end
+
+        # Login issue.
+        #
+        # @param target [ISCSI::Configs::Target]
+        # @return [Issue]
+        def login_issue(target)
+          Issue.new(format(_("Cannot login to iSCSI target %s"), target.name),
+            source:   Issue::Source::CONFIG,
+            severity: Issue::Severity::ERROR)
+        end
       end
     end
   end
diff --git a/service/lib/agama/storage/manager.rb b/service/lib/agama/storage/manager.rb
index 6109bb19e2..64874f7790 100644
--- a/service/lib/agama/storage/manager.rb
+++ b/service/lib/agama/storage/manager.rb
@@ -60,15 +60,16 @@ class Manager
       # Constructor
       #
       # @param product_config [Agama::Config]
-      # @param logger [Logger]
-      def initialize(product_config, logger)
+      # @param logger [Logger, nil]
+      def initialize(product_config, logger: nil)
         textdomain "agama"
 
         @product_config = product_config
-        @logger = logger
+        @logger = logger || Logger.new($stdout)
         @bootloader = Bootloader.new(logger)
+
+        register_progress_callbacks
         register_proposal_callbacks
-        on_progress_change { logger.info progress.to_s }
       end
 
       # Whether the system is in a deprecated status
@@ -184,7 +185,9 @@ def proposal
       #
       # @return [Storage::ISCSI::Manager]
       def iscsi
-        @iscsi ||= ISCSI::Manager.new(logger: logger)
+        # Uses the same progress as manager. Note that the callbacks of the progess are configured
+        # by the D-Bus object in order to properly update the Progress D-Bus interface.
+        @iscsi ||= ISCSI::Manager.new(progress_manager: progress_manager, logger: logger)
       end
 
       # Returns the client to ask the software service
@@ -227,6 +230,10 @@ def prohibit_bls_boot
         Y2Storage::StorageEnv.instance.reset_cache
       end
 
+      def register_progress_callbacks
+        on_progress_change { logger.info(progress.to_s) }
+      end
+
       # Issues are updated when the proposal is calculated
       def register_proposal_callbacks
         proposal.on_calculate { update_issues }
diff --git a/service/lib/agama/with_progress.rb b/service/lib/agama/with_progress.rb
index b3a5820aa5..cdf7a478a7 100644
--- a/service/lib/agama/with_progress.rb
+++ b/service/lib/agama/with_progress.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2022] SUSE LLC
+# Copyright (c) [2022-2025] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -19,70 +19,52 @@
 # To contact SUSE LLC about this file by physical or electronic mail, you may
 # find current contact information at www.suse.com.
 
-require "agama/progress"
+require "agama/progress_manager"
 
 module Agama
   # Mixin that allows to start a progress and configure callbacks
   module WithProgress
-    # There is an unfinished progress
-    class NotFinishedProgress < StandardError; end
+    # @return [ProgressManager]
+    def progress_manager
+      @progress_manager ||= Agama::ProgressManager.new
+    end
 
     # @return [Progress, nil]
-    attr_reader :progress
+    def progress
+      progress_manager.progress
+    end
 
     # Creates a new progress with a given number of steps
     #
     # @param size [Integer] Number of steps
     def start_progress_with_size(size)
-      start_progress(size: size)
+      progress_manager.start_with_size(size)
     end
 
     # Creates a new progress with a given set of steps
     #
     # @param descriptions [Array<String>] Steps descriptions
     def start_progress_with_descriptions(*descriptions)
-      start_progress(descriptions: descriptions)
+      progress_manager.start_with_descriptions(*descriptions)
     end
 
-    # Creates a new progress
-    #
-    # @raise [RuntimeError] if there is an unfinished progress.
-    #
-    # @param args [*Hash] Progress constructor arguments.
-    def start_progress(args)
-      raise NotFinishedProgress if progress && !progress.finished?
-
-      on_change_callbacks = @on_progress_change_callbacks || []
-      on_finish_callbacks = @on_progress_finish_callbacks || []
-
-      @progress = Progress.new(**args).tap do |progress|
-        progress.on_change { on_change_callbacks.each(&:call) }
-        progress.on_finish { on_finish_callbacks.each(&:call) }
-      end
-    end
-    private :start_progress
-
     # Finishes the current progress
     def finish_progress
-      return if progress.nil? || progress.finished?
-
-      progress.finish
+      progress_manager.finish
     end
 
     # Registers an on_change callback to be added to the progress
     #
     # @param block [Proc]
     def on_progress_change(&block)
-      @on_progress_change_callbacks ||= []
-      @on_progress_change_callbacks << block
+      progress_manager.on_change(&block)
     end
 
     # Registers an on_finish callback to be added to the progress
     #
     # @param block [Proc]
     def on_progress_finish(&block)
-      @on_progress_finish_callbacks ||= []
-      @on_progress_finish_callbacks << block
+      progress_manager.on_finish(&block)
     end
   end
 end
diff --git a/service/package/rubygem-agama-yast.changes b/service/package/rubygem-agama-yast.changes
index 31f426654d..9ce0537935 100644
--- a/service/package/rubygem-agama-yast.changes
+++ b/service/package/rubygem-agama-yast.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Apr  9 06:52:58 UTC 2025 - José Iván López González <jlopez@suse.com>
+
+- Add auto-installation support for iSCSI
+ (gh#agama-project/agama#2231).
+
 -------------------------------------------------------------------
 Wed Apr  9 06:42:38 UTC 2025 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
 
diff --git a/service/test/agama/dbus/interfaces/progress_test.rb b/service/test/agama/dbus/interfaces/progress_test.rb
index fcd0f4f280..aeda5776aa 100644
--- a/service/test/agama/dbus/interfaces/progress_test.rb
+++ b/service/test/agama/dbus/interfaces/progress_test.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2022] SUSE LLC
+# Copyright (c) [2022-2025] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -22,10 +22,12 @@
 require_relative "../../../test_helper"
 require "agama/dbus/base_object"
 require "agama/dbus/interfaces/progress"
+require "agama/dbus/with_progress"
 require "agama/with_progress"
 require "agama/progress"
 
 class DBusObjectWithProgressInterface < Agama::DBus::BaseObject
+  include Agama::DBus::WithProgress
   include Agama::DBus::Interfaces::Progress
 
   def initialize
diff --git a/service/test/agama/dbus/service_status_test.rb b/service/test/agama/dbus/service_status_test.rb
index e7d387aa17..bf7c71229f 100644
--- a/service/test/agama/dbus/service_status_test.rb
+++ b/service/test/agama/dbus/service_status_test.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2022] SUSE LLC
+# Copyright (c) [2022-2025] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -56,16 +56,18 @@
   describe "#busy" do
     before do
       subject.idle
-      subject.on_change { logger.info("change status") }
+      subject.on_change(&callback)
     end
 
+    let(:callback) { proc {} }
+
     it "sets the service status as busy" do
       subject.busy
       expect(subject.busy?).to eq(true)
     end
 
     it "runs the 'on_change' callbacks" do
-      expect(logger).to receive(:info).with(/change status/)
+      expect(callback).to receive(:call)
       subject.busy
     end
   end
@@ -73,17 +75,31 @@
   describe "#idle" do
     before do
       subject.busy
-      subject.on_change { logger.info("change status") }
+      subject.on_change(&callback)
     end
 
+    let(:callback) { proc {} }
+
     it "sets the service status as idle" do
       subject.idle
       expect(subject.busy?).to eq(false)
     end
 
     it "runs the 'on_change' callbacks" do
-      expect(logger).to receive(:info).with(/change status/)
+      expect(callback).to receive(:call)
       subject.idle
     end
   end
+
+  describe "#busy_while" do
+    let(:action) { proc {} }
+
+    it "sets the service status as busy, calls the given block and sets the service to idle" do
+      expect(subject).to receive(:idle)
+      expect(action).to receive(:call)
+      expect(subject).to receive(:busy)
+
+      subject.busy_while(&action)
+    end
+  end
 end
diff --git a/service/test/agama/dbus/storage/iscsi_node_test.rb b/service/test/agama/dbus/storage/iscsi_node_test.rb
index cfbe00d321..1a67a7d92a 100644
--- a/service/test/agama/dbus/storage/iscsi_node_test.rb
+++ b/service/test/agama/dbus/storage/iscsi_node_test.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2023] SUSE LLC
+# Copyright (c) [2023-2025] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -78,10 +78,19 @@
   end
 
   describe "#login" do
+    let(:empty_credentials) do
+      {
+        username:           nil,
+        password:           nil,
+        initiator_username: nil,
+        initiator_password: nil
+      }
+    end
+
     it "creates an iSCSI session" do
-      expect(iscsi_manager).to receive(:login) do |node, auth, startup:|
+      expect(iscsi_manager).to receive(:login) do |node, credentials:, startup:|
         expect(node).to eq(iscsi_node)
-        expect(auth).to be_a(Y2IscsiClient::Authentication)
+        expect(credentials).to eq(empty_credentials)
         expect(startup).to be_nil
       end
 
@@ -89,41 +98,34 @@
     end
 
     it "uses the given startup status" do
-      expect(iscsi_manager).to receive(:login).with(anything, anything, startup: "automatic")
+      expect(iscsi_manager).to receive(:login)
+        .with(anything, credentials: anything, startup: "automatic")
 
       subject.login({ "Startup" => "automatic" })
     end
 
-    context "when no authentication options are given" do
-      it "uses an empty authentication" do
-        expect(iscsi_manager).to receive(:login) do |_, auth|
-          expect(auth.by_target?).to eq(false)
-          expect(auth.by_initiator?).to eq(false)
-        end
-
-        subject.login
-      end
-    end
-
-    context "when authentication options are given" do
-      let(:auth_options) do
+    context "when credentials are given" do
+      let(:options) do
         {
-          "Username"        => "testi",
-          "Password"        => "testi",
-          "ReverseUsername" => "testt",
-          "ReversePassword" => "testt"
+          "Username"        => "target",
+          "Password"        => "12345",
+          "ReverseUsername" => "initiator",
+          "ReversePassword" => "54321"
         }
       end
 
-      it "uses the expected authentication" do
-        expect(iscsi_manager).to receive(:login) do |_, auth|
-          expect(auth.username).to eq("testi")
-          expect(auth.password).to eq("testi")
-          expect(auth.username_in).to eq("testt")
-          expect(auth.password_in).to eq("testt")
+      it "login with the expected credendials" do
+        expect(iscsi_manager).to receive(:login) do |_, credentials:, startup:|
+          expect(credentials).to eq({
+            username:           "target",
+            password:           "12345",
+            initiator_username: "initiator",
+            initiator_password: "54321"
+          })
+          expect(startup).to be_nil
         end
 
-        subject.login(auth_options)
+        subject.login(options)
       end
     end
 
diff --git a/service/test/agama/dbus/storage/iscsi_test.rb b/service/test/agama/dbus/storage/iscsi_test.rb
new file mode 100644
index 0000000000..e2f2a7bd9a
--- /dev/null
+++ b/service/test/agama/dbus/storage/iscsi_test.rb
@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+# Copyright (c) [2025] SUSE LLC
+#
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of version 2 of the GNU General Public License as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE LLC about this file by physical or electronic mail, you may
+# find current contact information at www.suse.com.
+
+require_relative "../../../test_helper"
+require "agama/dbus/storage/iscsi"
+require "agama/storage/iscsi/manager"
+
+describe Agama::DBus::Storage::ISCSI do
+  subject(:iscsi) { described_class.new(backend, logger: logger) }
+
+  let(:backend) { Agama::Storage::ISCSI::Manager.new }
+
+  let(:logger) { Logger.new($stdout, level: :warn) }
+
+  describe "#apply_config" do
+    let(:serialized_config) { config_json.to_json }
+
+    let(:config_json) do
+      {
+        initiator: "iqn.1996-04.de.suse:01:351e6d6249",
+        targets:   [
+          {
+            address:   "192.168.100.151",
+            port:      3260,
+            name:      "iqn.2025-01.com.example:becda24e8804c6580bd0",
+            interface: "default"
+          }
+        ]
+      }
+    end
+
+    it "applies the given iSCSI config" do
+      expect(backend).to receive(:apply_config_json).with(config_json)
+
+      subject.apply_config(serialized_config)
+    end
+
+    context "if the config is correctly applied" do
+      before do
+        allow(backend).to receive(:apply_config_json).with(config_json).and_return(true)
+      end
+
+      it "returns 0" do
+        result = subject.apply_config(serialized_config)
+
+        expect(result).to eq(0)
+      end
+    end
+
+    context "if the config is not correctly applied" do
+      before do
+        allow(backend).to receive(:apply_config_json).with(config_json).and_return(false)
+      end
+
+      it "returns 1" do
+        result = subject.apply_config(serialized_config)
+
+        expect(result).to eq(1)
+      end
+    end
+  end
+end
diff --git a/service/test/agama/dbus/storage/manager_test.rb b/service/test/agama/dbus/storage/manager_test.rb
index 4385e8010a..f3deaa8542 100644
--- a/service/test/agama/dbus/storage/manager_test.rb
+++ b/service/test/agama/dbus/storage/manager_test.rb
@@ -43,26 +43,14 @@ def serialize(value)
 describe Agama::DBus::Storage::Manager do
   include Agama::RSpec::StorageHelpers
 
-  subject(:manager) { described_class.new(backend, logger) }
+  subject(:manager) { described_class.new(backend, logger: logger) }
 
   let(:logger) { Logger.new($stdout, level: :warn) }
 
-  let(:backend) do
-    instance_double(Agama::Storage::Manager,
-      actions:                     [],
-      proposal:                    proposal,
-      iscsi:                       iscsi,
-      software:                    software,
-      product_config:              product_config,
-      calculate_proposal:          nil,
-      on_probe:                    nil,
-      on_progress_change:          nil,
-      on_progress_finish:          nil,
-      on_issues_change:            nil,
-      on_deprecated_system_change: nil)
-  end
+  let(:backend) { Agama::Storage::Manager.new(product_config) }
 
   let(:product_config) { Agama::Config.new(config_data) }
+
   let(:config_data) { {} }
 
   let(:proposal) { Agama::Storage::Proposal.new(product_config) }
@@ -83,6 +71,11 @@ def serialize(value)
     allow(Y2Storage::EncryptionMethod::TPM_FDE).to receive(:possible?).and_return(true)
     allow(Yast::Arch).to receive(:s390).and_return false
     allow(proposal).to receive(:on_calculate)
+    allow(backend).to receive(:actions).and_return([])
+    allow(backend).to receive(:iscsi).and_return(iscsi)
+    allow(backend).to receive(:software).and_return(software)
+    allow(backend).to receive(:proposal).and_return(proposal)
+    allow(backend).to receive(:calculate_proposal)
     mock_storage(devicegraph: "empty-hd-50GiB.yaml")
   end
 
@@ -859,57 +852,57 @@ def serialize(value)
 
   describe "#iscsi_discover" do
     it "performs an iSCSI discovery" do
-      expect(iscsi).to receive(:discover_send_targets) do |address, port, auth|
-        expect(address).to eq("192.168.100.90")
-        expect(port).to eq(3260)
-        expect(auth).to be_a(Y2IscsiClient::Authentication)
-      end
+      expect(iscsi).to receive(:discover).with("192.168.100.90", 3260, anything)
 
-      subject.iscsi_discover("192.168.100.90", 3260, {})
+      subject.iscsi_discover("192.168.100.90", 3260)
     end
 
     context "when no authentication options are given" do
-      let(:auth_options) { {} }
-
-      it "uses an empty authentication" do
-        expect(iscsi).to receive(:discover_send_targets) do |_, _, auth|
-          expect(auth.by_target?).to eq(false)
-          expect(auth.by_initiator?).to eq(false)
+      it "uses empty credentials" do
+        expect(iscsi).to receive(:discover) do |_, _, discover_options|
+          expect(discover_options[:credentials]).to eq({
+            username:           nil,
+            password:           nil,
+            initiator_username: nil,
+            initiator_password: nil
+          })
         end
 
-        subject.iscsi_discover("192.168.100.90", 3260, auth_options)
+        subject.iscsi_discover("192.168.100.90", 3260)
       end
     end
 
     context "when authentication options are given" do
-      let(:auth_options) do
+      let(:options) do
         {
-          "Username"        => "testi",
-          "Password"        => "testi",
-          "ReverseUsername" => "testt",
-          "ReversePassword" => "testt"
+          "Username"        => "target",
+          "Password"        => "12345",
+          "ReverseUsername" => "initiator",
+          "ReversePassword" => "54321"
         }
       end
 
-      it "uses the expected authentication" do
-        expect(iscsi).to receive(:discover_send_targets) do |_, _, auth|
-          expect(auth.username).to eq("testi")
-          expect(auth.password).to eq("testi")
-          expect(auth.username_in).to eq("testt")
-          expect(auth.password_in).to eq("testt")
+      it "uses the expected crendentials" do
+        expect(iscsi).to receive(:discover) do |_, _, discover_options|
+          expect(discover_options[:credentials]).to eq({
+            username:           "target",
+            password:           "12345",
+            initiator_username: "initiator",
+            initiator_password: "54321"
+          })
         end
 
-        subject.iscsi_discover("192.168.100.90", 3260, auth_options)
+        subject.iscsi_discover("192.168.100.90", 3260, options)
       end
     end
 
     context "when the action successes" do
       before do
-        allow(iscsi).to receive(:discover_send_targets).and_return(true)
+        allow(iscsi).to receive(:discover).and_return(true)
       end
 
       it "returns 0" do
-        result = subject.iscsi_discover("192.168.100.90", 3260, {})
+        result = subject.iscsi_discover("192.168.100.90", 3260)
 
         expect(result).to eq(0)
       end
@@ -917,11 +910,11 @@ def serialize(value)
 
     context "when the action fails" do
       before do
-        allow(iscsi).to receive(:discover_send_targets).and_return(false)
+        allow(iscsi).to receive(:discover).and_return(false)
       end
 
       it "returns 1" do
-        result = subject.iscsi_discover("192.168.100.90", 3260, {})
+        result = subject.iscsi_discover("192.168.100.90", 3260)
 
         expect(result).to eq(1)
       end
diff --git a/service/test/agama/progress_manager_test.rb b/service/test/agama/progress_manager_test.rb
new file mode 100644
index 0000000000..008b3c75f4
--- /dev/null
+++ b/service/test/agama/progress_manager_test.rb
@@ -0,0 +1,159 @@
+# frozen_string_literal: true
+
+# Copyright (c) [2025] SUSE LLC
+#
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of version 2 of the GNU General Public License as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE LLC about this file by physical or electronic mail, you may
+# find current contact information at www.suse.com.
+
+require_relative "../test_helper"
+require "agama/progress"
+require "agama/progress_manager"
+
+shared_examples "unfinished progress" do |action|
+  context "if there is an unfinished progress" do
+    before do
+      subject.start_with_size(1)
+    end
+
+    it "raises an error" do
+      expect { action.call(subject) }
+        .to raise_error(Agama::NotFinishedProgress)
+    end
+  end
+end
+
+shared_examples "callbacks" do |action|
+  it "configures the 'on_change' callbacks for the new progress" do
+    callback = proc {}
+    subject.on_change(&callback)
+
+    expect(callback).to receive(:call)
+
+    action.call(subject)
+    subject.progress.step
+  end
+
+  it "configures the 'on_finish' callbacks for the new progress" do
+    callback = proc {}
+    subject.on_finish(&callback)
+
+    expect(callback).to receive(:call)
+
+    action.call(subject)
+    subject.progress.finish
+  end
+end
+
+describe Agama::ProgressManager do
+  describe "#progress" do
+    context "if not progress was started" do
+      it "returns nil" do
+        expect(subject.progress).to be_nil
+      end
+    end
+
+    context "if a progress was started" do
+      before do
+        subject.start_with_size(1)
+      end
+
+      it "returns the progress object" do
+        expect(subject.progress).to be_a(Agama::Progress)
+      end
+    end
+  end
+
+  describe "#start_with_size" do
+    action = proc { |subject| subject.start_with_size(1) }
+
+    include_examples "unfinished progress", action
+
+    context "if there is no unfinished progress" do
+      before do
+        subject.start_with_size(1)
+        subject.progress.finish
+      end
+
+      it "creates a new progress" do
+        previous_progress = subject.progress
+        subject.start_with_size(1)
+        expect(subject.progress).to_not eq(previous_progress)
+        expect(subject.progress.total_steps).to eq(1)
+        expect(subject.progress.descriptions).to eq([])
+        expect(subject.progress.finished?).to eq(false)
+      end
+
+      include_examples "callbacks", action
+    end
+  end
+
+  describe "#start_with_descriptions" do
+    action = proc { |subject| subject.start_with_descriptions("step1", "step2") }
+
+    include_examples "unfinished progress", action
+
+    context "if there is no unfinished progress" do
+      before do
+        subject.start_with_size(1)
+        subject.progress.finish
+      end
+
+      it "creates a new progress" do
+        previous_progress = subject.progress
+        action.call(subject)
+        expect(subject.progress).to_not eq(previous_progress)
+        expect(subject.progress.total_steps).to eq(2)
+        expect(subject.progress.descriptions).to eq(["step1", "step2"])
+        expect(subject.progress.finished?).to eq(false)
+      end
+
+      include_examples "callbacks", action
+    end
+  end
+
+  describe "#finish" do
+    context "when the current progress is not finished" do
+      before do
+        subject.start_with_size(1)
+      end
+
+      it "finishes the current progress" do
+        expect { subject.finish }
+          .to change { subject.progress.finished? }
+          .from(false).to(true)
+      end
+    end
+
+    context "when the current progress is already finished" do
+      before do
+        subject.start_with_size(1)
+        subject.progress.step
+      end
+
+      it "does not crash" do
+        expect(subject.progress).to_not receive(:finish)
+        subject.finish
+      end
+    end
+
+    context "when there is no progress" do
+      it "does not crash" do
+        subject.finish
+      end
+    end
+  end
+end
diff --git a/service/test/agama/storage/iscsi/config_importer_test.rb b/service/test/agama/storage/iscsi/config_importer_test.rb
new file mode 100644
index 0000000000..16838280f8
--- /dev/null
+++ b/service/test/agama/storage/iscsi/config_importer_test.rb
@@ -0,0 +1,304 @@
+# frozen_string_literal: true
+
+# Copyright (c) [2025] SUSE LLC
+#
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of version 2 of the GNU General Public License as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE LLC about this file by physical or electronic mail, you may
+# find current contact information at www.suse.com.
+
+require_relative "../../../test_helper"
+require "agama/storage/iscsi/config"
+require "agama/storage/iscsi/configs/target"
+require "agama/storage/iscsi/config_importer"
+
+describe Agama::Storage::ISCSI::ConfigImporter do
+  subject { described_class.new(config_json) }
+
+  let(:config_json) { {} }
+
+  describe "#import" do
+    it "generates an iSCSI config" do
+      config = subject.import
+      expect(config).to be_a(Agama::Storage::ISCSI::Config)
+    end
+
+    context "with an empty JSON" do
+      it "sets #initiator to the expected value" do
+        config = subject.import
+        expect(config).to be_a(Agama::Storage::ISCSI::Config)
+        expect(config.initiator).to be_nil
+      end
+
+      it "sets #targets to the expected value" do
+        config = subject.import
+        expect(config.targets).to be_nil
+      end
+    end
+
+    context "with a JSON specifying 'initiator'" do
+      let(:config_json) do
+        { initiator: "iqn.1996-04.de.suse:01:351e6d6249" }
+      end
+
+      it "sets #initiator to the expected value" do
+        config = subject.import
+        expect(config.initiator).to eq("iqn.1996-04.de.suse:01:351e6d6249")
+      end
+    end
+
+    context "with a JSON specifying 'targets'" do
+      let(:config_json) do
+        { targets: targets }
+      end
+
+      context "with an empty list" do
+        let(:targets) { [] }
+
+        it "sets #targets to the expected value" do
+          config = subject.import
+          expect(config.targets).to eq([])
+        end
+      end
+
+      context "with a list of targets" do
+        let(:targets) do
+          [
+            target,
+            {
+              address:   "192.168.100.102",
+              port:      3264,
+              name:      "target2",
+              interface: "default"
+
+            }
+          ]
+        end
+
+        let(:target) { { name: "target1" } }
+
+        it "sets #targets to the expected value" do
+          config = subject.import
+          expect(config.targets.size).to eq(2)
+          expect(config.targets).to all(be_a(Agama::Storage::ISCSI::Configs::Target))
+
+          target1, target2 = config.targets
+          expect(target1.name).to eq("target1")
+          expect(target2.name).to eq("target2")
+        end
+
+        target_proc = proc { |c| c.targets.first }
+
+        context "if a target does not specify 'address'" do
+          let(:target) { {} }
+
+          it "sets #address to the expected value" do
+            target = target_proc.call(subject.import)
+            expect(target.address).to be_nil
+          end
+        end
+
+        context "if a target does not specify 'port'" do
+          let(:target) { {} }
+
+          it "sets #port to the expected value" do
+            target = target_proc.call(subject.import)
+            expect(target.port).to be_nil
+          end
+        end
+
+        context "if a target does not specify 'name'" do
+          let(:target) { {} }
+
+          it "sets #name to the expected value" do
+            target = target_proc.call(subject.import)
+            expect(target.name).to be_nil
+          end
+        end
+
+        context "if a target does not specify 'interface'" do
+          let(:target) { {} }
+
+          it "sets #interface to the expected value" do
+            target = target_proc.call(subject.import)
+            expect(target.interface).to be_nil
+          end
+        end
+
+        context "if a target does not specify 'startup'" do
+          let(:target) { {} }
+
+          it "sets #startup to the expected value" do
+            target = target_proc.call(subject.import)
+            expect(target.startup).to be_nil
+          end
+        end
+
+        context "if a target does not specify 'authByTarget'" do
+          let(:target) { {} }
+
+          it "sets #username to the expected value" do
+            target = target_proc.call(subject.import)
+            expect(target.username).to be_nil
+          end
+
+          it "sets #password to the expected value" do
+            target = target_proc.call(subject.import)
+            expect(target.password).to be_nil
+          end
+        end
+
+        context "if a target does not specify 'authByInitiator'" do
+          let(:target) { {} }
+
+          it "sets #initiator_username to the expected value" do
+            target = target_proc.call(subject.import)
+            expect(target.initiator_username).to be_nil
+          end
+
+          it "sets #initiator_password to the expected value" do
+            target = target_proc.call(subject.import)
+            expect(target.initiator_password).to be_nil
+          end
+        end
+
+        context "if a target specifies 'address'" do
+          let(:target) { { address: "192.168.100.101" } }
+
+          it "sets #address to the expected value" do
+            target = target_proc.call(subject.import)
+            expect(target.address).to eq("192.168.100.101")
+          end
+        end
+
+        context "if a target specifies 'port'" do
+          let(:target) { { port: 3264 } }
+
+          it "sets #port to the expected value" do
+            target = target_proc.call(subject.import)
+            expect(target.port).to eq(3264)
+          end
+        end
+
+        context "if a target specifies 'name'" do
+          let(:target) { { name: "taget1" } }
+
+          it "sets #name to the expected value" do
+            target = target_proc.call(subject.import)
+            expect(target.name).to eq("taget1")
+          end
+        end
+
+        context "if a target specifies 'interface'" do
+          let(:target) { { interface: "default" } }
+
+          it "sets #interface to the expected value" do
+            target = target_proc.call(subject.import)
+            expect(target.interface).to eq("default")
+          end
+        end
+
+        context "if a target specifies 'startup'" do
+          let(:target) { { startup: "manual" } }
+
+          it "sets #startup to the expected value" do
+            target = target_proc.call(subject.import)
+            expect(target.startup).to eq("manual")
+          end
+        end
+
+        context "if a target specifies 'authByTarget'" do
+          let(:target) { { authByTarget: credentials } }
+
+          context "and it does specify 'username'" do
+            let(:credentials) { {} }
+
+            it "sets #username to the expected value" do
+              target = target_proc.call(subject.import)
+              expect(target.username).to be_nil
+            end
+          end
+
+          context "and it does specify 'password'" do
+            let(:credentials) { {} }
+
+            it "sets #password to the expected value" do
+              target = target_proc.call(subject.import)
+              expect(target.password).to be_nil
+            end
+          end
+
+          context "and it specifies 'username'" do
+            let(:credentials) { { username: "test" } }
+
+            it "sets #username to the expected value" do
+              target = target_proc.call(subject.import)
+              expect(target.username).to eq("test")
+            end
+          end
+
+          context "and it specifies 'password'" do
+            let(:credentials) { { password: "12345" } }
+
+            it "sets #password to the expected value" do
+              target = target_proc.call(subject.import)
+              expect(target.password).to eq("12345")
+            end
+          end
+        end
+
+        context "if a target specifies 'authByInitiator'" do
+          let(:target) { { authByInitiator: credentials } }
+
+          context "and it does specify 'username'" do
+            let(:credentials) { {} }
+
+            it "sets #initiator_username to the expected value" do
+              target = target_proc.call(subject.import)
+              expect(target.initiator_username).to be_nil
+            end
+          end
+
+          context "and it does specify 'password'" do
+            let(:credentials) { {} }
+
+            it "sets #initiator_password to the expected value" do
+              target = target_proc.call(subject.import)
+              expect(target.initiator_password).to be_nil
+            end
+          end
+
+          context "and it specifies 'username'" do
+            let(:credentials) { { username: "test" } }
+
+            it "sets #initiator_username to the expected value" do
+              target = target_proc.call(subject.import)
+              expect(target.initiator_username).to eq("test")
+            end
+          end
+
+          context "and it specifies 'password'" do
+            let(:credentials) { { password: "12345" } }
+
+            it "sets #initiator_password to the expected value" do
+              target = target_proc.call(subject.import)
+              expect(target.initiator_password).to eq("12345")
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/service/test/agama/storage/iscsi/manager_test.rb b/service/test/agama/storage/iscsi/manager_test.rb
index 95b5098147..b762dfed27 100644
--- a/service/test/agama/storage/iscsi/manager_test.rb
+++ b/service/test/agama/storage/iscsi/manager_test.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2023] SUSE LLC
+# Copyright (c) [2023-2025] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -20,16 +20,27 @@
 # find current contact information at www.suse.com.
 
 require_relative "../../../test_helper"
-require "agama/storage/iscsi/manager"
+require "agama/storage/iscsi/adapter"
+require "agama/storage/iscsi/initiator"
 require "agama/storage/iscsi/node"
+require "agama/storage/iscsi/manager"
 
 describe Agama::Storage::ISCSI::Manager do
   subject { described_class.new(logger: logger) }
 
   let(:logger) { Logger.new($stdout, level: :warn) }
 
+  # Mocks YaST calls done by the iSCSI adapter, see {Agama::Storage::ISCSI::Adapter}.
+  #
+  # These tests should be agnostic to the adapter. In this case, directly mocking the adapter code
+  # is not that bad because having more iSCSI adapters is not expected at all.
+  #
+  # If any other adapter is added at some point, then these tests have to be refactored and each
+  # adapter should have its own tests.
   before do
-    allow(Yast::IscsiClientLib).to receive(:getiBFT)
+    allow(Yast::IscsiClientLib).to receive(:initiatorname).and_return(initiator_name)
+    allow(Yast::IscsiClientLib).to receive(:GetOffloadCard).and_return(offload_card)
+    allow(Yast::IscsiClientLib).to receive(:getiBFT).and_return(ibft)
     allow(Yast::IscsiClientLib).to receive(:checkInitiatorName)
     allow(Yast::IscsiClientLib).to receive(:getConfig)
     allow(Yast::IscsiClientLib).to receive(:autoLogOn)
@@ -40,11 +51,37 @@
     allow(Yast::IscsiClientLib).to receive(:iBFT?)
     allow(Yast::IscsiClientLib).to receive(:find_session)
     allow(Yast::IscsiClientLib).to receive(:getStartupStatus)
+    allow(subject).to receive(:adapter).and_return(adapter)
     allow(subject).to receive(:sleep)
   end
 
+  let(:initiator_name) { "iqn.1996-04.de.suse:01:351e6d6249" }
+
+  let(:offload_card) { "test-card" }
+
+  let(:ibft) { { "iSCSI_INITIATOR_NAME" => "test-name" } }
+
   let(:yast_nodes) { [] }
 
+  let(:adapter) { Agama::Storage::ISCSI::Adapter.new }
+
+  describe "#activate" do
+    it "activates iSCSI" do
+      expect(adapter).to receive(:activate).and_call_original
+
+      subject.activate
+    end
+
+    it "runs the callbacks" do
+      callback = proc {}
+      subject.on_activate(&callback)
+
+      expect(callback).to receive(:call)
+
+      subject.activate
+    end
+  end
+
   describe "#probe" do
     let(:yast_nodes) do
       [
@@ -53,6 +90,15 @@
       ]
     end
 
+    it "reads the initiator" do
+      subject.probe
+
+      expect(subject.initiator).to be_a(Agama::Storage::ISCSI::Initiator)
+      expect(subject.initiator.name).to eq("iqn.1996-04.de.suse:01:351e6d6249")
+      expect(subject.initiator.offload_card).to eq("test-card")
+      expect(subject.initiator.ibft_name?).to eq(true)
+    end
+
     it "reads the discoverd nodes" do
       subject.probe
 
@@ -74,9 +120,8 @@
       ))
     end
 
-    let(:callback) { proc {} }
-
     it "runs the callbacks" do
+      callback = proc {}
       subject.on_probe(&callback)
 
       expect(callback).to receive(:call)
@@ -85,30 +130,119 @@
     end
   end
 
-  describe "#discover_send_targets" do
+  describe "#update_initiator" do
+    context "if iSCSI is not probed yet" do
+      it "does not set the initiator name" do
+        expect(Yast::IscsiClientLib).to_not receive(:writeInitiatorName)
+
+        subject.update_initiator(name: "test-name", offload_card: "test-card")
+      end
+
+      it "does not set the offload card" do
+        expect(Yast::IscsiClientLib).to_not receive(:setOffloadCard)
+
+        subject.update_initiator(name: "test-name", offload_card: "test-card")
+      end
+    end
+
+    context "if the iSCSI is probed" do
+      before do
+        subject.probe
+      end
+
+      context "and the given name is the same" do
+        let(:name) { initiator_name }
+
+        it "does not set the initiator name" do
+          expect(Yast::IscsiClientLib).to_not receive(:writeInitiatorName)
+
+          subject.update_initiator(name: name)
+        end
+      end
+
+      context "and the given name is not the same" do
+        let(:name) { "test-name" }
+
+        it "sets the initiator name" do
+          expect(Yast::IscsiClientLib).to receive(:writeInitiatorName).with("test-name")
+
+          subject.update_initiator(name: name)
+        end
+      end
+
+      context "and the given offload card is the same" do
+        let(:card) { offload_card }
+
+        it "does not set the offload card" do
+          expect(Yast::IscsiClientLib).to_not receive(:SetOffloadCard)
+
+          subject.update_initiator(offload_card: card)
+        end
+      end
+
+      context "and the given offload card is not the same" do
+        let(:card) { "test-card" }
+
+        it "sets the offload card" do
+          expect(Yast::IscsiClientLib).to_not receive(:SetOffloadCard).with("test-card")
+
+          subject.update_initiator(offload_card: card)
+        end
+      end
+    end
+  end
+
+  describe "#discover" do
     before do
       allow(Yast::IscsiClientLib).to receive(:discover)
     end
 
-    let(:auth) { Y2IscsiClient::Authentication.new }
+    it "performs iSCSI discovery without credentials" do
+      expect(Yast::IscsiClientLib).to receive(:discover) do |host, port, auth, _|
+        expect(host).to eq("192.168.100.101")
+        expect(port).to eq(3264)
+        expect(auth).to be_a(Y2IscsiClient::Authentication)
+        expect(auth.username).to be_nil
+        expect(auth.password).to be_nil
+        expect(auth.username_in).to be_nil
+        expect(auth.password_in).to be_nil
+      end
+
+      subject.discover("192.168.100.101", 3264)
+    end
 
-    it "performs iSCSI discovery" do
-      expect(Yast::IscsiClientLib).to receive(:discover)
+    it "performs iSCSI discovery with credentials" do
+      credentials = {
+        username:           "target",
+        password:           "12345",
+        initiator_username: "initiator",
+        initiator_password: "54321"
+      }
+
+      expect(Yast::IscsiClientLib).to receive(:discover) do |host, port, auth, _|
+        expect(host).to eq("192.168.100.101")
+        expect(port).to eq(3264)
+        expect(auth).to be_a(Y2IscsiClient::Authentication)
+        expect(auth.username).to eq("target")
+        expect(auth.password).to eq("12345")
+        expect(auth.username_in).to eq("initiator")
+        expect(auth.password_in).to eq("54321")
+      end
 
-      subject.discover_send_targets("192.168.100.101", 3264, auth)
+      subject.discover("192.168.100.101", 3264, credentials: credentials)
     end
 
     it "probes iSCSI" do
       expect(subject).to receive(:probe)
 
-      subject.discover_send_targets("192.168.100.101", 3264, auth)
+      subject.discover("192.168.100.101", 3264)
     end
 
     context "if iSCSI activation is not performed yet" do
       it "activates iSCSI" do
         expect(subject).to receive(:activate)
 
-        subject.discover_send_targets("192.168.100.101", 3264, auth)
+        subject.discover("192.168.100.101", 3264)
       end
     end
 
@@ -120,7 +254,7 @@
       it "does not activate iSCSI again" do
         expect(subject).to_not receive(:activate)
 
-        subject.discover_send_targets("192.168.100.101", 3264, auth)
+        subject.discover("192.168.100.101", 3264)
       end
     end
   end
@@ -128,8 +262,6 @@
   describe "#login" do
     let(:node) { Agama::Storage::ISCSI::Node.new }
 
-    let(:auth) { Y2IscsiClient::Authentication.new }
-
     before do
       allow(Yast::IscsiClientLib).to receive(:default_startup_status).and_return("onboot")
       allow(Yast::IscsiClientLib).to receive(:login_into_current)
@@ -147,17 +279,46 @@
 
     let(:startup_success) { nil }
 
-    it "tries to login" do
-      expect(Yast::IscsiClientLib).to receive(:login_into_current)
+    it "tries to login without credentials" do
+      expect(Yast::IscsiClientLib).to receive(:login_into_current) do |auth, _|
+        expect(auth).to be_a(Y2IscsiClient::Authentication)
+        expect(auth.username).to be_nil
+        expect(auth.password).to be_nil
+        expect(auth.username_in).to be_nil
+        expect(auth.password_in).to be_nil
+      end.and_return(true)
+
+      expect(Yast::IscsiClientLib).to receive(:setStartupStatus).with("automatic")
 
-      subject.login(node, auth, startup: startup)
+      subject.login(node, startup: startup)
+    end
+
+    it "tries to login with credentials" do
+      credentials = {
+        username:           "target",
+        password:           "12345",
+        initiator_username: "initiator",
+        initiator_password: "54321"
+      }
+
+      expect(Yast::IscsiClientLib).to receive(:login_into_current) do |auth, _|
+        expect(auth).to be_a(Y2IscsiClient::Authentication)
+        expect(auth.username).to eq("target")
+        expect(auth.password).to eq("12345")
+        expect(auth.username_in).to eq("initiator")
+        expect(auth.password_in).to eq("54321")
+      end.and_return(true)
+
+      expect(Yast::IscsiClientLib).to receive(:setStartupStatus).with("automatic")
+
+      subject.login(node, credentials: credentials, startup: startup)
     end
 
     context "if iSCSI activation is not performed yet" do
       it "activates iSCSI" do
         expect(subject).to receive(:activate)
 
-        subject.login(node, auth, startup: startup)
+        subject.login(node)
       end
     end
 
@@ -169,7 +330,7 @@
       it "does not activate iSCSI again" do
         expect(subject).to_not receive(:activate)
 
-        subject.login(node, auth, startup: startup)
+        subject.login(node)
       end
     end
 
@@ -182,11 +343,11 @@
         it "probes iSCSI" do
           expect(subject).to receive(:probe)
 
-          subject.login(node, auth, startup: startup)
+          subject.login(node)
         end
 
         it "returns true" do
-          result = subject.login(node, auth, startup: startup)
+          result = subject.login(node)
 
           expect(result).to eq(true)
         end
@@ -198,11 +359,11 @@
         it "probes iSCSI" do
           expect(subject).to receive(:probe)
 
-          subject.login(node, auth, startup: startup)
+          subject.login(node)
         end
 
         it "returns false" do
-          result = subject.login(node, auth, startup: startup)
+          result = subject.login(node)
 
           expect(result).to eq(false)
         end
@@ -289,4 +450,269 @@
       subject.update(node, startup: "manual")
     end
   end
+
+  describe "#apply_config_json" do
+    context "if iSCSI activation is not performed yet" do
+      it "activates iSCSI" do
+        expect(subject).to receive(:activate)
+
+        subject.apply_config_json({})
+      end
+    end
+
+    context "if iSCSI activation was already performed" do
+      before do
+        subject.activate
+      end
+
+      it "does not activate iSCSI again" do
+        expect(subject).to_not receive(:activate)
+
+        subject.apply_config_json({})
+      end
+    end
+
+    context "if the config does not specify the initiator name" do
+      it "does not update the initiator" do
+        expect(adapter).to_not receive(:update_initiator)
+
+        subject.apply_config_json({})
+      end
+
+      it "returns true" do
+        result = subject.apply_config_json({})
+
+        expect(result).to eq(true)
+      end
+    end
+
+    context "if the config specifies the initiator name" do
+      let(:config_json) { { initiator: initiator } }
+
+      context "and the name is equal to the current inititator name" do
+        let(:initiator_name) { "iqn.1996-04.de.suse:01:351e6d6249" }
+
+        let(:initiator) { initiator_name }
+
+        it "does not update the initiator" do
+          expect(adapter).to_not receive(:update_initiator)
+
+          subject.apply_config_json(config_json)
+        end
+
+        it "returns true" do
+          result = subject.apply_config_json(config_json)
+
+          expect(result).to eq(true)
+        end
+      end
+
+      context "and the name is not equal to the current inititator name" do
+        let(:initiator_name) { "iqn.1996-04.de.suse:01:351e6d6249" }
+
+        let(:initiator) { "iqn.1996-04.de.suse:01:351e6d6250" }
+
+        it "updates the initiator" do
+          expect(adapter).to receive(:update_initiator).with(anything, name: initiator)
+
+          subject.apply_config_json(config_json)
+        end
+
+        it "returns true" do
+          result = subject.apply_config_json(config_json)
+
+          expect(result).to eq(true)
+        end
+      end
+    end
+
+    context "if the config does not specify targets" do
+      let(:config_json) { {} }
+
+      it "does not modify the sessions" do
+        expect(adapter).to_not receive(:logout)
+        expect(adapter).to_not receive(:login)
+
+        subject.apply_config_json(config_json)
+      end
+
+      it "does not run the callbacks" do
+        callback = proc {}
+        subject.on_sessions_change(&callback)
+
+        expect(callback).to_not receive(:call)
+
+        subject.apply_config_json(config_json)
+      end
+
+      it "returns true" do
+        result = subject.apply_config_json(config_json)
+
+        expect(result).to eq(true)
+      end
+    end
+
+    context "if the config specifies targets" do
+      let(:config_json) { { targets: targets } }
+
+      let(:yast_nodes) do
+        [
+          "192.168.100.101:3264 iqn.2023-01.com.example:12ac588 default",
+          "192.168.100.102:3264 iqn.2023-01.com.example:12ac589"
+        ]
+      end
+
+      before do
+        allow(adapter).to receive(:find_session_for).and_call_original
+        # Mock session (connected target).
+        allow(adapter).to receive(:find_session_for).with([
+                                                            "192.168.100.101:3264",
+                                                            "iqn.2023-01.com.example:12ac588",
+                                                            "default"
+                                                          ]).and_return([])
+      end
+
+      shared_examples "callbacks" do
+        it "runs the callbacks" do
+          callback = proc {}
+          subject.on_sessions_change(&callback)
+
+          expect(callback).to receive(:call)
+
+          subject.apply_config_json(config_json)
+        end
+      end
+
+      context "and the list is empty" do
+        let(:targets) { [] }
+
+        it "performs logout of all connected targets" do
+          expect(adapter).to receive(:logout)
+            .with(an_object_having_attributes(target: "iqn.2023-01.com.example:12ac588"))
+
+          expect(adapter).to_not receive(:logout)
+            .with(an_object_having_attributes(target: "iqn.2023-01.com.example:12ac589"))
+
+          subject.apply_config_json(config_json)
+        end
+
+        it "does not login to any target" do
+          expect(adapter).to_not receive(:login)
+
+          subject.apply_config_json(config_json)
+        end
+
+        include_examples "callbacks"
+
+        it "returns true" do
+          result = subject.apply_config_json(config_json)
+
+          expect(result).to eq(true)
+        end
+      end
+
+      context "and the list is not empty" do
+        let(:targets) do
+          [
+            {
+              address:         "192.168.100.151",
+              port:            3260,
+              name:            "iqn.2025-01.com.example:becda24e8804c6580bd0",
+              interface:       "default",
+              startup:         "onboot",
+              authByTarget:    {
+                username: "test1",
+                password: "12345"
+              },
+              authByInitiator: {
+                username: "test2",
+                password: "54321"
+              }
+            },
+            {
+              address:   "192.168.100.152",
+              port:      3260,
+              name:      "iqn.2025-01.com.example:becda24e8804c6580bd1",
+              interface: "default"
+            }
+          ]
+        end
+
+        before do
+          allow(adapter).to receive(:login).and_return(true)
+        end
+
+        it "tries to login to each target" do
+          expect(adapter).to receive(:login) do |node, options|
+            expect(node.address).to eq("192.168.100.151")
+            expect(node.port).to eq(3260)
+            expect(node.target).to eq("iqn.2025-01.com.example:becda24e8804c6580bd0")
+            expect(node.interface).to eq("default")
+
+            startup = options[:startup]
+            expect(startup).to eq("onboot")
+
+            credentials = options[:credentials]
+            expect(credentials[:username]).to eq("test1")
+            expect(credentials[:password]).to eq("12345")
+            expect(credentials[:initiator_username]).to eq("test2")
+            expect(credentials[:initiator_password]).to eq("54321")
+          end
+
+          expect(adapter).to receive(:login) do |node, options|
+            expect(node.address).to eq("192.168.100.152")
+            expect(node.port).to eq(3260)
+            expect(node.target).to eq("iqn.2025-01.com.example:becda24e8804c6580bd1")
+            expect(node.interface).to eq("default")
+
+            startup = options[:startup]
+            expect(startup).to be_nil
+
+            credentials = options[:credentials]
+            expect(credentials[:username]).to be_nil
+            expect(credentials[:password]).to be_nil
+            expect(credentials[:initiator_username]).to be_nil
+            expect(credentials[:initiator_password]).to be_nil
+          end
+
+          subject.apply_config_json(config_json)
+        end
+
+        include_examples "callbacks"
+
+        it "returns true" do
+          result = subject.apply_config_json(config_json)
+
+          expect(result).to eq(true)
+        end
+
+        context "and fails to login" do
+          before do
+            allow(adapter).to receive(:login).and_return(false)
+          end
+
+          it "does not try to login the rest of targets" do
+            expect(adapter).to receive(:login).once
+
+            subject.apply_config_json(config_json)
+          end
+
+          it "reports an issue" do
+            subject.apply_config_json(config_json)
+
+            expect(subject.issues.size).to eq(1)
+            expect(subject.issues.first.description).to match(/Cannot login .*0bd0/)
+          end
+
+          include_examples "callbacks"
+
+          it "returns false" do
+            result = subject.apply_config_json(config_json)
+
+            expect(result).to eq(false)
+          end
+        end
+      end
+    end
+  end
 end
diff --git a/service/test/agama/storage/manager_test.rb b/service/test/agama/storage/manager_test.rb
index 9081779a12..c43728586c 100644
--- a/service/test/agama/storage/manager_test.rb
+++ b/service/test/agama/storage/manager_test.rb
@@ -40,7 +40,7 @@
 describe Agama::Storage::Manager do
   include Agama::RSpec::StorageHelpers
 
-  subject(:storage) { described_class.new(config, logger) }
+  subject(:storage) { described_class.new(config, logger: logger) }
 
   let(:logger) { Logger.new($stdout, level: :warn) }
   let(:config_path) do
@@ -406,6 +406,7 @@
       before do
         FileUtils.mkdir_p(scripts_dir)
         FileUtils.touch(File.join(scripts_dir, "test.sh"))
+        allow(Yast::Execute).to receive("locally").with("agama", "logs", "store", any_args)
       end
 
       it "copies the artifacts to the installed system" do
diff --git a/service/test/agama/with_progress_examples.rb b/service/test/agama/with_progress_examples.rb
index 89146bcef1..9e8876548c 100644
--- a/service/test/agama/with_progress_examples.rb
+++ b/service/test/agama/with_progress_examples.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2023] SUSE LLC
+# Copyright (c) [2023-2025] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -48,7 +48,7 @@
 
       it "raises an error" do
         expect { subject.start_progress_with_size(1) }
-          .to raise_error(Agama::WithProgress::NotFinishedProgress)
+          .to raise_error(Agama::NotFinishedProgress)
       end
     end
 
diff --git a/web/package/agama-web-ui.changes b/web/package/agama-web-ui.changes
index 8a055c24cb..308c92dad5 100644
--- a/web/package/agama-web-ui.changes
+++ b/web/package/agama-web-ui.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Apr  9 05:36:35 UTC 2025 - José Iván López González <jlopez@suse.com>
+
+- Fix layout of iSCSI page (gh#agama-project/agama#2231).
+
 -------------------------------------------------------------------
 Tue Apr  1 08:53:43 UTC 2025 - José Iván López González <jlopez@suse.com>
 
diff --git a/web/src/components/storage/ISCSIPage.tsx b/web/src/components/storage/ISCSIPage.tsx
index 32a02eb6c9..77aea6b721 100644
--- a/web/src/components/storage/ISCSIPage.tsx
+++ b/web/src/components/storage/ISCSIPage.tsx
@@ -35,10 +35,10 @@ export default function ISCSIPage() {
       </Page.Header>
       <Page.Content>
         <Grid hasGutter>
-          <GridItem sm={12} xl={6}>
+          <GridItem sm={12}>
             <InitiatorSection />
           </GridItem>
-          <GridItem sm={12} xl={6}>
+          <GridItem sm={12}>
             <TargetsSection />
           </GridItem>
         </Grid>
diff --git a/web/src/components/storage/iscsi/NodesPresenter.jsx b/web/src/components/storage/iscsi/NodesPresenter.jsx
index 42072e7254..fa39e2be8a 100644
--- a/web/src/components/storage/iscsi/NodesPresenter.jsx
+++ b/web/src/components/storage/iscsi/NodesPresenter.jsx
@@ -115,7 +115,7 @@ export default function NodesPresenter({ nodes }) {
 
   return (
     <>
-      <Table variant="compact">
+      <Table variant="compact" gridBreakPoint="grid-lg">
         <Thead>
           <Tr>
             <Th>{_("Name")}</Th>