diff --git a/assets/overlays/openstack-manila/generated/hypershift/controller.yaml b/assets/overlays/openstack-manila/generated/hypershift/controller.yaml
index fcef5312e..c72803662 100644
--- a/assets/overlays/openstack-manila/generated/hypershift/controller.yaml
+++ b/assets/overlays/openstack-manila/generated/hypershift/controller.yaml
@@ -126,6 +126,15 @@ spec:
           requests:
             cpu: 10m
             memory: 50Mi
+        startupProbe:
+          exec:
+            command:
+            - sh
+            - -c
+            - test -S /plugin/csi-nfs.sock
+          failureThreshold: 6
+          initialDelaySeconds: 30
+          periodSeconds: 5
         terminationMessagePolicy: FallbackToLogsOnError
         volumeMounts:
         - mountPath: /plugin
diff --git a/assets/overlays/openstack-manila/generated/standalone/controller.yaml b/assets/overlays/openstack-manila/generated/standalone/controller.yaml
index 277a65b6c..9f55b66d5 100644
--- a/assets/overlays/openstack-manila/generated/standalone/controller.yaml
+++ b/assets/overlays/openstack-manila/generated/standalone/controller.yaml
@@ -96,6 +96,15 @@ spec:
           requests:
             cpu: 10m
             memory: 50Mi
+        startupProbe:
+          exec:
+            command:
+            - sh
+            - -c
+            - test -S /plugin/csi-nfs.sock
+          failureThreshold: 6
+          initialDelaySeconds: 30
+          periodSeconds: 5
         terminationMessagePolicy: FallbackToLogsOnError
         volumeMounts:
         - mountPath: /plugin
diff --git a/assets/overlays/openstack-manila/patches/controller_add_driver.yaml b/assets/overlays/openstack-manila/patches/controller_add_driver.yaml
index a969a23ed..6cc7437b4 100644
--- a/assets/overlays/openstack-manila/patches/controller_add_driver.yaml
+++ b/assets/overlays/openstack-manila/patches/controller_add_driver.yaml
@@ -81,6 +81,17 @@ spec:
             timeoutSeconds: 10
             periodSeconds: 30
             failureThreshold: 5
+          # CSI driver initialization requires that the NFS driver socket
+          # exists which should take less than a minute.
+          startupProbe:
+            exec:
+              command:
+              - sh
+              - -c
+              - "test -S /plugin/csi-nfs.sock"
+            initialDelaySeconds: 30
+            periodSeconds: 5
+            failureThreshold: 6
           volumeMounts:
             - name: socket-dir
               mountPath: /plugin