diff --git a/config/samples/backends/bases/openstack/kustomization.yaml b/config/samples/backends/bases/openstack/kustomization.yaml
index addf3df4..5d38218b 100644
--- a/config/samples/backends/bases/openstack/kustomization.yaml
+++ b/config/samples/backends/bases/openstack/kustomization.yaml
@@ -1,4 +1,17 @@
 resources:
-- openstack.yaml
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
+  - https://raw.githubusercontent.com/openstack-k8s-operators/openstack-operator/main/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml
+
+patches:
+  - target:
+      kind: OpenStackControlPlane
+      name: .*
+    patch: |-
+      - op: remove
+        path: /spec/manila/template/manilaShares
+  - target:
+      kind: OpenStackControlPlane
+      name: .*
+    patch: |-
+      - op: replace
+        path: /metadata/name
+        value: openstack
diff --git a/config/samples/backends/bases/openstack/openstack.yaml b/config/samples/backends/bases/openstack/openstack.yaml
deleted file mode 100644
index 6338c1cb..00000000
--- a/config/samples/backends/bases/openstack/openstack.yaml
+++ /dev/null
@@ -1,146 +0,0 @@
-# Modified version of https://github.com/openstack-k8s-operators/openstack-operator/blob/main/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml
-# with some changes relevant for Manila
-apiVersion: core.openstack.org/v1beta1
-kind: OpenStackControlPlane
-metadata:
-  name: openstack
-spec:
-  secret: osp-secret
-  storageClass: local-storage
-  keystone:
-    template:
-      databaseInstance: openstack
-      secret: osp-secret
-  mariadb:
-    enabled: false
-    templates:
-      openstack:
-        storageRequest: 500M
-      openstack-cell1:
-        storageRequest: 500M
-  galera:
-    enabled: true
-    templates:
-      openstack:
-        storageRequest: 500M
-        secret: osp-secret
-        replicas: 1
-      openstack-cell1:
-        storageRequest: 500M
-        secret: osp-secret
-        replicas: 1
-  rabbitmq:
-    templates:
-      rabbitmq:
-        replicas: 1
-      rabbitmq-cell1:
-        replicas: 1
-  memcached:
-    templates:
-      memcached:
-        replicas: 1
-  placement:
-    template:
-      databaseInstance: openstack
-      secret: osp-secret
-  glance:
-    template:
-      databaseInstance: openstack
-      storageClass: ""
-      storageRequest: 10G
-  cinder:
-    template:
-      databaseInstance: openstack
-      secret: osp-secret
-      cinderAPI:
-        replicas: 1
-      cinderScheduler:
-        replicas: 1
-      cinderBackup:
-        replicas: 0 # backend needs to be configured
-      cinderVolumes:
-        volume1:
-          replicas: 0 # backend needs to be configured
-  manila:
-    template:
-      manilaAPI:
-        replicas: 1
-      manilaScheduler:
-        replicas: 1
-      manilaShares:
-        share1:
-          replicas: 1
-  ovn:
-    template:
-      ovnDBCluster:
-        ovndbcluster-nb:
-          replicas: 1
-          dbType: NB
-          storageRequest: 10G
-        ovndbcluster-sb:
-          replicas: 1
-          dbType: SB
-          storageRequest: 10G
-      ovnNorthd:
-        replicas: 1
-      ovnController:
-        external-ids:
-          system-id: "random"
-          ovn-bridge: "br-int"
-          ovn-encap-type: "geneve"
-  neutron:
-    template:
-      databaseInstance: openstack
-      secret: osp-secret
-  horizon:
-    template:
-      replicas: 1
-      secret: osp-secret
-  nova:
-    template:
-      secret: osp-secret
-  heat:
-    enabled: false
-    template:
-      databaseInstance: openstack
-      heatAPI:
-        replicas: 1
-      heatEngine:
-        replicas: 1
-      secret: osp-secret
-  ironic:
-    enabled: false
-    template:
-      databaseInstance: openstack
-      ironicAPI:
-        replicas: 1
-      ironicConductors:
-      - replicas: 1
-        storageRequest: 10G
-      ironicInspector:
-        replicas: 1
-      ironicNeutronAgent:
-        replicas: 1
-      secret: osp-secret
-  ceilometer:
-    template:
-      passwordSelector:
-        service: CeilometerPassword
-      secret: osp-secret
-      serviceUser: ceilometer
-  swift:
-    enabled: true
-    template:
-      swiftRing:
-        ringReplicas: 1
-      swiftStorage:
-        replicas: 1
-      swiftProxy:
-        replicas: 1
-  octavia:
-    enabled: false
-    template:
-      databaseInstance: openstack
-      octaviaAPI:
-        replicas: 1
-      secret: osp-secret
diff --git a/config/samples/backends/ceph-nfs/backend.yaml b/config/samples/backends/ceph-nfs/backend.yaml
index 46e46f1c..fba2f81d 100644
--- a/config/samples/backends/ceph-nfs/backend.yaml
+++ b/config/samples/backends/ceph-nfs/backend.yaml
@@ -30,6 +30,8 @@ spec:
               cephfs_nfs_cluster_id=cephfs
               cephfs_protocol_helper_type=NFS
           replicas: 1
+          networkAttachments:
+          - storage
   extraMounts:
     - name: v1
       region: r1
diff --git a/config/samples/backends/cephfs/backend.yaml b/config/samples/backends/cephfs/backend.yaml
index cf5060ba..b7289dbe 100644
--- a/config/samples/backends/cephfs/backend.yaml
+++ b/config/samples/backends/cephfs/backend.yaml
@@ -33,6 +33,8 @@ spec:
               cephfs_volume_mode=0755
               cephfs_protocol_helper_type=CEPHFS
           replicas: 1
+          networkAttachments:
+          - storage
   extraMounts:
     - name: v1
       region: r1
diff --git a/config/samples/backends/dhss-netapp/dhss.yaml b/config/samples/backends/dhss-netapp/dhss.yaml
index e3835621..9c01787e 100644
--- a/config/samples/backends/dhss-netapp/dhss.yaml
+++ b/config/samples/backends/dhss-netapp/dhss.yaml
@@ -18,6 +18,8 @@ spec:
         replicas: 1
       manilaShares:
         share1:
+          networkAttachments:
+          - storage
           replicas: 1
           customServiceConfig: |
             [DEFAULT]
diff --git a/config/samples/backends/multibackend/backend.yaml b/config/samples/backends/multibackend/backend.yaml
index 312b8923..8ac6e384 100644
--- a/config/samples/backends/multibackend/backend.yaml
+++ b/config/samples/backends/multibackend/backend.yaml
@@ -20,6 +20,8 @@ spec:
         containerImage: quay.io/tripleozedcentos9/openstack-manila-scheduler:current-tripleo
       manilaShares:
         share1:
+          networkAttachments:
+          - storage
           customServiceConfig: |
               [DEFAULT]
               enabled_share_backends=cephfsnfs
@@ -34,6 +36,8 @@ spec:
           containerImage: quay.io/tripleozedcentos9/openstack-manila-share:current-tripleo
           replicas: 1
         share2:
+          networkAttachments:
+          - storage
           customServiceConfig: |
               [DEFAULT]
               enabled_share_backends=cephfs
@@ -51,6 +55,8 @@ spec:
           containerImage: quay.io/tripleozedcentos9/openstack-manila-share:current-tripleo
           replicas: 1
         share3:
+          networkAttachments:
+          - storage
           customServiceConfig: |
             [DEFAULT]
             debug = true
diff --git a/config/samples/backends/netapp/backend.yaml b/config/samples/backends/netapp/backend.yaml
index 52f83f4d..11f3dcc1 100644
--- a/config/samples/backends/netapp/backend.yaml
+++ b/config/samples/backends/netapp/backend.yaml
@@ -18,6 +18,8 @@ spec:
         replicas: 1
       manilaShares:
         share1:
+          networkAttachments:
+          - storage
           customServiceConfig: |
             [DEFAULT]
             debug = true