diff --git a/patches/openstack/cinder/sep-sp-iscsi.patch b/patches/openstack/cinder/sep-sp-iscsi.patch
index 90af1b2..11be7e1 100644
--- a/patches/openstack/cinder/sep-sp-iscsi.patch
+++ b/patches/openstack/cinder/sep-sp-iscsi.patch
@@ -1,4 +1,4 @@
-From 98e9487ad99ac6969e5ae58601ab5550b947202b Mon Sep 17 00:00:00 2001
+From 8b6c5042b388e1eb7423f808483c236de353357a Mon Sep 17 00:00:00 2001
 From: Peter Penchev <openstack-dev@storpool.com>
 Date: Mon, 12 Mar 2018 12:00:10 +0200
 Subject: [PATCH] Add iSCSI export support to the StorPool driver
@@ -1032,10 +1032,10 @@
                  self._sp_api.volume_update(int_name, {'rename': temp_name})
                  return {'_name_id': None}
 diff --git a/doc/source/configuration/block-storage/drivers/storpool-volume-driver.rst b/doc/source/configuration/block-storage/drivers/storpool-volume-driver.rst
-index d2c5895a9..936e83675 100644
+index e9209b0cc..451cd3ef8 100644
 --- a/doc/source/configuration/block-storage/drivers/storpool-volume-driver.rst
 +++ b/doc/source/configuration/block-storage/drivers/storpool-volume-driver.rst
-@@ -19,12 +19,15 @@ Prerequisites
+@@ -19,12 +19,43 @@ Prerequisites
  * The controller and all the compute nodes must have access to the StorPool
    API service.
  
@@ -1052,13 +1052,7 @@
 +  being used as a transport, then the node running the ``cinder-volume``
 +  service must also have access to the StorPool data network and run
 +  the ``storpool_block`` service.
- 
- * All nodes that need to access the StorPool API (the compute nodes and
-   the node running the ``cinder-volume`` service) must have the following
-@@ -34,6 +37,34 @@ Prerequisites
-   * the storpool Python bindings package
-   * the storpool.spopenstack Python helper package
- 
++
 +Using iSCSI as the transport protocol
 +-------------------------------------
 +
@@ -1086,11 +1080,10 @@
 +Multiattach support for StorPool is only enabled if iSCSI is used:
 +``storpool_iscsi_export_to`` is set to ``*``, that is, when all StorPool
 +volumes will be exported via iSCSI to all initiators.
-+
+ 
  Configuring the StorPool volume driver
  --------------------------------------
- 
-@@ -55,6 +86,35 @@ volume backend definition) and per volume type:
+@@ -47,6 +78,35 @@ volume backend definition) and per volume type:
    with the default placement constraints for the StorPool cluster.
    The default value for the chain replication is 3.
  
diff --git a/patches/openstack/cinder/use-os-brick-api-client.patch b/patches/openstack/cinder/use-os-brick-api-client.patch
index ec9cc76..0e23a25 100644
--- a/patches/openstack/cinder/use-os-brick-api-client.patch
+++ b/patches/openstack/cinder/use-os-brick-api-client.patch
@@ -1,4 +1,4 @@
-From e22f4c612183d4552ea3f4917537dd50963a5d26 Mon Sep 17 00:00:00 2001
+From 89a7a3bf5fb34198d595aa906cdf3ee9f6647f48 Mon Sep 17 00:00:00 2001
 From: Biser Milanov <biser.milanov@storpool.com>
 Date: Mon, 14 Oct 2024 14:25:22 +0300
 Subject: [PATCH] StorPool: Use os-brick instead of packages `storpool` and
@@ -12,9 +12,10 @@
 ---
  .../unit/volume/drivers/test_storpool.py      | 168 +++++++---------
  cinder/volume/drivers/storpool.py             | 183 +++++++++---------
+ .../drivers/storpool-volume-driver.rst        |   8 -
  ...-config-code-in-tree-92cfe30690b78ef1.yaml |   8 +
  requirements.txt                              |   2 +-
- 4 files changed, 173 insertions(+), 188 deletions(-)
+ 5 files changed, 173 insertions(+), 196 deletions(-)
  create mode 100644 releasenotes/notes/storpool-move-api-and-config-code-in-tree-92cfe30690b78ef1.yaml
 
 diff --git a/cinder/tests/unit/volume/drivers/test_storpool.py b/cinder/tests/unit/volume/drivers/test_storpool.py
@@ -673,6 +674,25 @@
              LOG.error('StorPool revert_to_snapshot(): could not revert '
                        'the %(vol_id)s volume to the %(snap_id)s snapshot: '
                        '%(err)s',
+diff --git a/doc/source/configuration/block-storage/drivers/storpool-volume-driver.rst b/doc/source/configuration/block-storage/drivers/storpool-volume-driver.rst
+index d2c5895a9..e9209b0cc 100644
+--- a/doc/source/configuration/block-storage/drivers/storpool-volume-driver.rst
++++ b/doc/source/configuration/block-storage/drivers/storpool-volume-driver.rst
+@@ -26,14 +26,6 @@ Prerequisites
+   images, then the node running the ``cinder-volume`` service must also have
+   access to the StorPool data network and run the ``storpool_block`` service.
+ 
+-* All nodes that need to access the StorPool API (the compute nodes and
+-  the node running the ``cinder-volume`` service) must have the following
+-  packages installed:
+-
+-  * storpool-config (part of the StorPool installation)
+-  * the storpool Python bindings package
+-  * the storpool.spopenstack Python helper package
+-
+ Configuring the StorPool volume driver
+ --------------------------------------
+ 
 diff --git a/releasenotes/notes/storpool-move-api-and-config-code-in-tree-92cfe30690b78ef1.yaml b/releasenotes/notes/storpool-move-api-and-config-code-in-tree-92cfe30690b78ef1.yaml
 new file mode 100644
 index 000000000..13c2cbd65