diff --git a/deploy/nfs/kubernetes/csi-nfsplugin.yaml b/deploy/nfs/kubernetes/csi-nfsplugin.yaml
index 1f3007283..86dba8625 100644
--- a/deploy/nfs/kubernetes/csi-nfsplugin.yaml
+++ b/deploy/nfs/kubernetes/csi-nfsplugin.yaml
@@ -18,7 +18,7 @@ spec:
             - --probe-timeout=3s
             - --health-port=29653
             - --v=2
-          image: registry.k8s.io/sig-storage/livenessprobe:v2.5.0
+          image: registry.k8s.io/sig-storage/livenessprobe:v2.6.0
           imagePullPolicy: IfNotPresent
           name: liveness-probe
           resources:
@@ -44,7 +44,7 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: spec.nodeName
-          image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.4.0
+          image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.0
           imagePullPolicy: IfNotPresent
           livenessProbe:
             exec:
diff --git a/internal/kms/vault.go b/internal/kms/vault.go
index 14f9ff974..d529c2a88 100644
--- a/internal/kms/vault.go
+++ b/internal/kms/vault.go
@@ -352,7 +352,7 @@ func initVaultKMS(args ProviderInitArgs) (EncryptionKMS, error) {
 
 	kms.vaultConfig[vault.AuthMountPath], err = detectAuthMountPath(vaultAuthPath)
 	if err != nil {
-		return nil, fmt.Errorf("failed to set %s in Vault config: %w", vault.AuthMountPath, err)
+		return nil, fmt.Errorf("failed to set \"vaultAuthPath\" in Vault config: %w", err)
 	}
 
 	vaultRole := vaultDefaultRole
diff --git a/internal/nfs/controller/controllerserver.go b/internal/nfs/controller/controllerserver.go
index 75a0c515c..31e75abcd 100644
--- a/internal/nfs/controller/controllerserver.go
+++ b/internal/nfs/controller/controllerserver.go
@@ -18,6 +18,7 @@ package controller
 
 import (
 	"context"
+	"strings"
 
 	"github.com/ceph/ceph-csi/internal/cephfs"
 	"github.com/ceph/ceph-csi/internal/cephfs/store"
@@ -140,8 +141,8 @@ func (cs *Server) DeleteVolume(
 	defer nfsVolume.Destroy()
 
 	err = nfsVolume.DeleteExport()
-	// TODO: if the export does not exist, but the backend does, delete the backend
-	if err != nil {
+	// if the export does not exist, continue with deleting the backend volume
+	if err != nil && !strings.Contains(err.Error(), "Export does not exist") {
 		return nil, status.Errorf(codes.InvalidArgument, "failed to delete export: %v", err)
 	}