diff --git a/assets/overlays/openstack-manila/generated/hypershift/node.yaml b/assets/overlays/openstack-manila/generated/hypershift/node.yaml
index 4d75663e0..f4c3d1da9 100644
--- a/assets/overlays/openstack-manila/generated/hypershift/node.yaml
+++ b/assets/overlays/openstack-manila/generated/hypershift/node.yaml
@@ -155,6 +155,28 @@ spec:
           name: registration-dir
       dnsPolicy: ClusterFirstWithHostNet
       hostNetwork: true
+      initContainers:
+      - command:
+        - sh
+        - -c
+        - |
+          until [ -S /var/lib/kubelet/plugins/csi-nfsplugin/csi.sock ]; do
+            echo "Waiting for NFS CSI plugin socket..."
+            sleep 2
+          done
+        image: ${DRIVER_IMAGE}
+        name: wait-for-nfs-plugin
+        resources:
+          requests:
+            cpu: 10m
+            memory: 50Mi
+        securityContext:
+          privileged: false
+          readOnlyRootFilesystem: true
+        terminationMessagePolicy: FallbackToLogsOnError
+        volumeMounts:
+        - mountPath: /var/lib/kubelet/plugins/csi-nfsplugin
+          name: fwd-plugin-dir
       nodeSelector:
         kubernetes.io/os: linux
       priorityClassName: system-node-critical
diff --git a/assets/overlays/openstack-manila/generated/standalone/node.yaml b/assets/overlays/openstack-manila/generated/standalone/node.yaml
index 4d75663e0..f4c3d1da9 100644
--- a/assets/overlays/openstack-manila/generated/standalone/node.yaml
+++ b/assets/overlays/openstack-manila/generated/standalone/node.yaml
@@ -155,6 +155,28 @@ spec:
           name: registration-dir
       dnsPolicy: ClusterFirstWithHostNet
       hostNetwork: true
+      initContainers:
+      - command:
+        - sh
+        - -c
+        - |
+          until [ -S /var/lib/kubelet/plugins/csi-nfsplugin/csi.sock ]; do
+            echo "Waiting for NFS CSI plugin socket..."
+            sleep 2
+          done
+        image: ${DRIVER_IMAGE}
+        name: wait-for-nfs-plugin
+        resources:
+          requests:
+            cpu: 10m
+            memory: 50Mi
+        securityContext:
+          privileged: false
+          readOnlyRootFilesystem: true
+        terminationMessagePolicy: FallbackToLogsOnError
+        volumeMounts:
+        - mountPath: /var/lib/kubelet/plugins/csi-nfsplugin
+          name: fwd-plugin-dir
       nodeSelector:
         kubernetes.io/os: linux
       priorityClassName: system-node-critical
diff --git a/assets/overlays/openstack-manila/patches/node_add_driver.yaml b/assets/overlays/openstack-manila/patches/node_add_driver.yaml
index d131b6c9c..143d6b0fe 100644
--- a/assets/overlays/openstack-manila/patches/node_add_driver.yaml
+++ b/assets/overlays/openstack-manila/patches/node_add_driver.yaml
@@ -87,6 +87,28 @@ spec:
               cpu: 10m
               memory: 50Mi
           terminationMessagePolicy: FallbackToLogsOnError
+      initContainers:
+        - name: wait-for-nfs-plugin
+          image: ${DRIVER_IMAGE}
+          command:
+            - sh
+            - -c
+            - |
+              until [ -S /var/lib/kubelet/plugins/csi-nfsplugin/csi.sock ]; do
+                echo "Waiting for NFS CSI plugin socket..."
+                sleep 2
+              done
+          securityContext:
+            readOnlyRootFilesystem: true
+            privileged: false
+          resources:
+            requests:
+              cpu: 10m
+              memory: 50Mi
+          terminationMessagePolicy: FallbackToLogsOnError
+          volumeMounts:
+            - name: fwd-plugin-dir
+              mountPath: /var/lib/kubelet/plugins/csi-nfsplugin
       volumes:
         - name: registration-dir
           hostPath: