diff --git a/cloud/blockstore/tools/csi_driver/internal/driver/node.go b/cloud/blockstore/tools/csi_driver/internal/driver/node.go
index 9193ab62a1..4a3d631487 100644
--- a/cloud/blockstore/tools/csi_driver/internal/driver/node.go
+++ b/cloud/blockstore/tools/csi_driver/internal/driver/node.go
@@ -33,7 +33,6 @@ const topologyNodeKey = "topology.nbs.csi/node"
 
 const nbsSocketName = "nbs.sock"
 const nfsSocketName = "nfs.sock"
-const stagingDirName = "staging"
 
 const vhostIpc = nbsapi.EClientIpcType_IPC_VHOST
 const nbdIpc = nbsapi.EClientIpcType_IPC_NBD
@@ -161,17 +160,15 @@ func (s *nodeService) NodeStageVolume(
 		var err error
 		if instanceID := req.VolumeContext[instanceIDKey]; instanceID != "" {
 			stageRecordPath := filepath.Join(req.StagingTargetPath, req.VolumeId+".json")
-
 			// Backend can be empty for old disks, in this case we use NBS
 			backend := "nbs"
 			if nfsBackend {
 				backend = "nfs"
 			}
-
 			if err = s.writeStageData(stageRecordPath, &StageData{
 				Backend:       backend,
 				InstanceId:    instanceID,
-				RealStagePath: s.getEndpointDir(stagingDirName, req.VolumeId),
+				RealStagePath: s.getEndpointDir(instanceID, req.VolumeId),
 			}); err != nil {
 				return nil, s.statusErrorf(codes.Internal,
 					"Failed to wriete stage record: %v", err)
@@ -284,7 +281,7 @@ func (s *nodeService) NodePublishVolume(
 	case *csi.VolumeCapability_Mount:
 		if s.vmMode {
 			if instanceID != "" {
-				err = s.nodePublishStagedVhostSocket(req)
+				err = s.nodePublishStagedVhostSocket(req, instanceID)
 			} else {
 				if nfsBackend {
 					err = s.nodePublishFileStoreAsVhostSocket(ctx, req)
@@ -472,7 +469,7 @@ func (s *nodeService) nodeStageDiskAsVhostSocket(
 
 	log.Printf("csi.nodeStageDiskAsVhostSocket: %s %s %+v", instanceId, volumeId, volumeContext)
 
-	endpointDir := s.getEndpointDir(stagingDirName, volumeId)
+	endpointDir := s.getEndpointDir(instanceId, volumeId)
 	if err := os.MkdirAll(endpointDir, os.FileMode(0755)); err != nil {
 		return err
 	}
@@ -671,7 +668,7 @@ func (s *nodeService) nodeStageFileStoreAsVhostSocket(
 
 	log.Printf("csi.nodeStageFileStoreAsVhostSocket: %s %s", instanceID, volumeID)
 
-	endpointDir := s.getEndpointDir(stagingDirName, volumeID)
+	endpointDir := s.getEndpointDir(instanceID, volumeID)
 	if err := os.MkdirAll(endpointDir, os.FileMode(0755)); err != nil {
 		return err
 	}
@@ -693,11 +690,14 @@ func (s *nodeService) nodeStageFileStoreAsVhostSocket(
 		return fmt.Errorf("failed to start NFS endpoint: %w", err)
 	}
 
+	log.Printf("csi.nodeStageFileStoreAsVhostSocket: started endpoint %q",
+		filepath.Join(endpointDir, nfsSocketName))
+
 	return s.createDummyImgFile(endpointDir)
 }
 
-func (s *nodeService) nodePublishStagedVhostSocket(req *csi.NodePublishVolumeRequest) error {
-	endpointDir := s.getEndpointDir(stagingDirName, req.VolumeId)
+func (s *nodeService) nodePublishStagedVhostSocket(req *csi.NodePublishVolumeRequest, instanceId string) error {
+	endpointDir := s.getEndpointDir(instanceId, req.VolumeId)
 	return s.mountSocketDir(endpointDir, req)
 }
 
@@ -812,7 +812,7 @@ func (s *nodeService) nodeUnstageVhostSocket(
 	}
 
 	// remove staging folder if it's empty
-	ignoreError(os.Remove(s.getEndpointDir(stagingDirName, "")))
+	ignoreError(os.Remove(s.getEndpointDir(stageData.InstanceId, "")))
 	return nil
 }
 
diff --git a/cloud/blockstore/tools/csi_driver/internal/driver/node_test.go b/cloud/blockstore/tools/csi_driver/internal/driver/node_test.go
index b8f55f5a07..1517abb2ba 100644
--- a/cloud/blockstore/tools/csi_driver/internal/driver/node_test.go
+++ b/cloud/blockstore/tools/csi_driver/internal/driver/node_test.go
@@ -210,7 +210,7 @@ func doTestStagedPublishUnpublishVolumeForKubevirt(t *testing.T, backend string,
 	}
 	stagingTargetPath := filepath.Join(tempDir, "testStagingTargetPath")
 	socketsDir := filepath.Join(tempDir, "sockets")
-	sourcePath := filepath.Join(socketsDir, stagingDirName, diskID)
+	sourcePath := filepath.Join(socketsDir, instanceID, diskID)
 	targetPath := filepath.Join(tempDir, "pods", podID, "volumes", diskID, "mount")
 	targetFsPathPattern := filepath.Join(tempDir, "pods/([a-z0-9-]+)/volumes/([a-z0-9-]+)/mount")
 	nbsSocketPath := filepath.Join(sourcePath, "nbs.sock")