diff --git a/internal/cephfs/controllerserver.go b/internal/cephfs/controllerserver.go
index d62ca53de..799766cbc 100644
--- a/internal/cephfs/controllerserver.go
+++ b/internal/cephfs/controllerserver.go
@@ -151,7 +151,7 @@ func (cs *ControllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
 	}
 	defer cs.VolumeLocks.Release(requestName)
 
-	volOptions, err := newVolumeOptions(ctx, requestName, req, secret)
+	volOptions, err := newVolumeOptions(ctx, requestName, req, cr)
 	if err != nil {
 		util.ErrorLog(ctx, "validation and extraction of volume options failed: %v", err)
 		return nil, status.Error(codes.InvalidArgument, err.Error())
diff --git a/internal/cephfs/volumeoptions.go b/internal/cephfs/volumeoptions.go
index e2e082502..916ae03f0 100644
--- a/internal/cephfs/volumeoptions.go
+++ b/internal/cephfs/volumeoptions.go
@@ -171,7 +171,7 @@ func getClusterInformation(options map[string]string) (*util.ClusterInfo, error)
 // newVolumeOptions generates a new instance of volumeOptions from the provided
 // CSI request parameters.
 func newVolumeOptions(ctx context.Context, requestName string, req *csi.CreateVolumeRequest,
-	secret map[string]string) (*volumeOptions, error) {
+	cr *util.Credentials) (*volumeOptions, error) {
 	var (
 		opts volumeOptions
 		err  error
@@ -210,12 +210,6 @@ func newVolumeOptions(ctx context.Context, requestName string, req *csi.CreateVo
 
 	opts.RequestName = requestName
 
-	cr, err := util.NewAdminCredentials(secret)
-	if err != nil {
-		return nil, err
-	}
-	defer cr.DeleteCredentials()
-
 	err = opts.Connect(cr)
 	if err != nil {
 		return nil, err