diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index aa2f9e4d2ae5..40d826b69858 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -28005,8 +28005,9 @@
   };
   vinetos = {
     name = "vinetos";
-    email = "vinetosdev@gmail.com";
+    email = "contact+git@vinetos.fr";
     github = "vinetos";
+    matrix = "@vinetos:matrix.org";
     githubId = 10145351;
   };
   vinnymeller = {
diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix
index 94a5d129c0c7..dfd971232cdd 100644
--- a/pkgs/development/python-modules/python-openstackclient/default.nix
+++ b/pkgs/development/python-modules/python-openstackclient/default.nix
@@ -44,6 +44,10 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-CEz1v4e4NadSZ+qhotFtLB4y/KdhDZbDOohN8D9FB30=";
   };
 
+  patches = [
+    ./fix-pyproject.patch
+  ];
+
   env.PBR_VERSION = finalAttrs.version;
 
   build-system = [
@@ -75,11 +79,22 @@ buildPythonPackage (finalAttrs: {
   checkPhase = ''
     runHook preCheck
     stestr run -E \
-      "openstackclient.tests.unit.(volume.v3.test_volume.(TestVolumeCreate|TestVolumeShow)|common.test_module.TestModuleList)"
+      "openstackclient.tests.unit.common.test_module.TestModuleList.(test_module_list_no_options|test_module_list_all)"
     runHook postCheck
   '';
 
-  pythonImportsCheck = [ "openstackclient" ];
+  pythonImportsCheck = [
+    "openstackclient"
+    "openstackclient.api"
+    "openstackclient.common"
+    "openstackclient.compute"
+    "openstackclient.identity"
+    "openstackclient.image"
+    "openstackclient.network"
+    "openstackclient.object"
+    "openstackclient.volume"
+    "openstackclient.tests"
+  ];
 
   optional-dependencies = {
     # See https://github.com/openstack/python-openstackclient/blob/master/doc/source/contributor/plugins.rst
diff --git a/pkgs/development/python-modules/python-openstackclient/fix-pyproject.patch b/pkgs/development/python-modules/python-openstackclient/fix-pyproject.patch
new file mode 100644
index 000000000000..4ce54df89254
--- /dev/null
+++ b/pkgs/development/python-modules/python-openstackclient/fix-pyproject.patch
@@ -0,0 +1,18 @@
+diff --git a/pyproject.toml b/pyproject.toml
+index 37fb8d0c..21571714 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -730,10 +730,9 @@ volume_transfer_request_show = "openstackclient.volume.v3.volume_transfer_reques
+ volume_summary = "openstackclient.volume.v3.volume:VolumeSummary"
+ volume_revert = "openstackclient.volume.v3.volume:VolumeRevertToSnapshot"
+ 
+-[tool.setuptools]
+-packages = [
+-    "openstackclient"
+-]
++[tool.setuptools.packages.find]
++where = ["."]
++include = ["openstackclient*"]
+ 
+ [tool.mypy]
+ python_version = "3.10"