diff --git a/pkg/logentry/pipeline.go b/pkg/logentry/pipeline.go
index 372c1db5343c17012bac5b4db2b76fccd4a815e9..5c0c19312aa130529323e2960539aa91f9dce2f5 100644
--- a/pkg/logentry/pipeline.go
+++ b/pkg/logentry/pipeline.go
@@ -60,7 +60,7 @@ func NewPipeline(logger log.Logger, stgs PipelineStages, plObserverMicroSeconds
 				}
 				st = append(st, docker)
 			case "cri":
-				cri, err := stages.NewCri(logger)
+				cri, err := stages.NewCRI(logger)
 				if err != nil {
 					return nil, errors.Wrap(err, "invalid cri stage config")
 				}
diff --git a/pkg/logentry/stages/extensions.go b/pkg/logentry/stages/extensions.go
index 184457a1441ff07c8c3dd48745d54ad00fca29f2..a99c2be56890152c241c401997c7a52649aa4c5b 100644
--- a/pkg/logentry/stages/extensions.go
+++ b/pkg/logentry/stages/extensions.go
@@ -23,8 +23,8 @@ func NewDocker(logger log.Logger) (Stage, error) {
 	return NewJSON(logger, config)
 }
 
-// NewCri creates a CRI format specific pipeline stage
-func NewCri(logger log.Logger) (Stage, error) {
+// NewCRI creates a CRI format specific pipeline stage
+func NewCRI(logger log.Logger) (Stage, error) {
 	config := map[string]interface{}{
 		"expression": "^(?s)(?P<time>\\S+?) (?P<stream>stdout|stderr) (?P<flags>\\S+?) (?P<content>.*)$",
 		"timestamp": map[string]interface{}{
diff --git a/pkg/logentry/stages/extensions_test.go b/pkg/logentry/stages/extensions_test.go
index 4781d3399f833345c05c1910e5c84c0d1733d9ce..da61e72016d2b791db66cec85f903fd2e4315e42 100644
--- a/pkg/logentry/stages/extensions_test.go
+++ b/pkg/logentry/stages/extensions_test.go
@@ -139,7 +139,7 @@ func TestNewCri(t *testing.T) {
 		tt := tt
 		t.Run(tName, func(t *testing.T) {
 			t.Parallel()
-			p, err := NewCri(util.Logger)
+			p, err := NewCRI(util.Logger)
 			if err != nil {
 				t.Fatalf("failed to create CRI parser: %s", err)
 			}
diff --git a/pkg/logentry/stages/json_test.go b/pkg/logentry/stages/json_test.go
index bc9951d2792c9f8b2643da7a5861b2b66e571cfd..1d797dbc1e340327dc89204d0a350a2dd54b658b 100644
--- a/pkg/logentry/stages/json_test.go
+++ b/pkg/logentry/stages/json_test.go
@@ -20,6 +20,7 @@ var cfg = `json:
   output:
     source: log`
 
+// nolint
 func TestYamlMapStructure(t *testing.T) {
 	t.Parallel()
 
diff --git a/pkg/logentry/stages/regex_test.go b/pkg/logentry/stages/regex_test.go
index 4ca753e126e54529cbec51e5214283bb4e8a0668..17c9de914230c55c3fd7abc08ab94e2c8358d5bd 100644
--- a/pkg/logentry/stages/regex_test.go
+++ b/pkg/logentry/stages/regex_test.go
@@ -23,6 +23,7 @@ var regexCfg = `regex:
   output:
     source: log`
 
+// nolint
 func TestRegexMapStructure(t *testing.T) {
 	t.Parallel()
 
diff --git a/pkg/logentry/stages/util_test.go b/pkg/logentry/stages/util_test.go
index e43ba516a49ac928370f0d970085b03b624b90a5..26bd2f76834dffeff92c275ea2818a892f536480 100644
--- a/pkg/logentry/stages/util_test.go
+++ b/pkg/logentry/stages/util_test.go
@@ -8,6 +8,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
+// nolint
 func mustParseTime(layout, value string) time.Time {
 	t, err := time.Parse(layout, value)
 	if err != nil {
diff --git a/pkg/promtail/targets/filetargetmanager.go b/pkg/promtail/targets/filetargetmanager.go
index 6ab04031cdb2d32e4e70cbc98eafde5516ed4ea5..a3a53039c843a138280fc9b2ec6ed8b42b991610 100644
--- a/pkg/promtail/targets/filetargetmanager.go
+++ b/pkg/promtail/targets/filetargetmanager.go
@@ -92,7 +92,7 @@ func NewFileTargetManager(
 			switch cfg.EntryParser {
 			case api.CRI:
 				level.Warn(logger).Log("msg", "WARNING!!! entry_parser config is deprecated, please change to pipeline_stages")
-				cri, err := stages.NewCri(logger)
+				cri, err := stages.NewCRI(logger)
 				if err != nil {
 					return nil, err
 				}