diff --git a/ansible/inventory/all-in-one b/ansible/inventory/all-in-one
index d8ef9082e9..8473beeeb0 100644
--- a/ansible/inventory/all-in-one
+++ b/ansible/inventory/all-in-one
@@ -237,7 +237,7 @@ manila
 manila
 
 [manila-share:children]
-storage
+network
 
 [manila-data:children]
 storage
diff --git a/ansible/inventory/multinode b/ansible/inventory/multinode
index 9580f68196..6aa695d8c3 100644
--- a/ansible/inventory/multinode
+++ b/ansible/inventory/multinode
@@ -255,7 +255,7 @@ manila
 manila
 
 [manila-share:children]
-storage
+network
 
 [manila-data:children]
 storage
diff --git a/releasenotes/notes/move-manila-share-to-network-node-57c61e757c5b96b2.yaml b/releasenotes/notes/move-manila-share-to-network-node-57c61e757c5b96b2.yaml
new file mode 100644
index 0000000000..ffee6db92e
--- /dev/null
+++ b/releasenotes/notes/move-manila-share-to-network-node-57c61e757c5b96b2.yaml
@@ -0,0 +1,7 @@
+---
+prelude: >
+  - Move manila-share service to network node.
+upgrade:
+  - Is required that for the generic driver the manila-share
+    service should be run on the network node.
+    The generic driver is our default driver, so this change is needed.