diff --git a/internal/cephfs/util.go b/internal/cephfs/util.go
index c5c7c54d5..cdb6a4560 100644
--- a/internal/cephfs/util.go
+++ b/internal/cephfs/util.go
@@ -62,7 +62,6 @@ func execCommandErr(ctx context.Context, program string, args ...string) error {
 	return err
 }
 
-//nolint: unparam
 func execCommandJSON(ctx context.Context, v interface{}, program string, args ...string) error {
 	stdout, _, err := execCommand(ctx, program, args...)
 	if err != nil {
diff --git a/internal/rbd/controllerserver.go b/internal/rbd/controllerserver.go
index edc7bb14e..d5637b76d 100644
--- a/internal/rbd/controllerserver.go
+++ b/internal/rbd/controllerserver.go
@@ -682,7 +682,8 @@ func (cs *ControllerServer) ValidateVolumeCapabilities(ctx context.Context, req
 
 // CreateSnapshot creates the snapshot in backend and stores metadata
 // in store
-// nolint: gocyclo
+// TODO: make this function less complex
+// nolint:gocyclo // complexity needs to be reduced.
 func (cs *ControllerServer) CreateSnapshot(ctx context.Context, req *csi.CreateSnapshotRequest) (*csi.CreateSnapshotResponse, error) {
 	if err := cs.validateSnapshotReq(ctx, req); err != nil {
 		return nil, err
diff --git a/internal/rbd/nodeserver.go b/internal/rbd/nodeserver.go
index a11fc0750..3ac55dbf1 100644
--- a/internal/rbd/nodeserver.go
+++ b/internal/rbd/nodeserver.go
@@ -98,7 +98,8 @@ var (
 //   - Map the image (creates a device)
 //   - Create the staging file/directory under staging path
 //   - Stage the device (mount the device mapped for image)
-// nolint: gocyclo
+// TODO: make this function less complex
+// nolint:gocyclo // complexity needs to be reduced.
 func (ns *NodeServer) NodeStageVolume(ctx context.Context, req *csi.NodeStageVolumeRequest) (*csi.NodeStageVolumeResponse, error) {
 	if err := util.ValidateNodeStageVolumeRequest(req); err != nil {
 		return nil, err
diff --git a/internal/util/csiconfig_test.go b/internal/util/csiconfig_test.go
index e2e2f069f..79bfc3faf 100644
--- a/internal/util/csiconfig_test.go
+++ b/internal/util/csiconfig_test.go
@@ -32,7 +32,8 @@ func cleanupTestData() {
 	os.RemoveAll(basePath)
 }
 
-// nolint: gocyclo
+// TODO: make this function less complex
+// nolint:gocyclo // complexity needs to be reduced.
 func TestCSIConfig(t *testing.T) {
 	var err error
 	var data string