diff --git a/.errcheck.txt b/.errcheck.txt
deleted file mode 100644
index 64671e21f..000000000
--- a/.errcheck.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-(*github.com/tektoncd/pipeline/vendor/go.uber.org/zap.SugaredLogger).Sync
-flag.Set
-os.Setenv
-logger.Sync
-fmt.Fprintf
-fmt.Fprintln
-(io.Closer).Close
-updateConfigMap
diff --git a/.golangci.yml b/.golangci.yml
index afad0f9b1..f1c575bf4 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -5,15 +5,23 @@ issues:
     - path: _test\.go
       linters:
         - gosec
+  exclude-dirs:
+    - vendor
 run:
   issues-exit-code: 1
   build-tags:
     - e2e
-  skip-dirs:
-    - vendor
 linters-settings:
   errcheck:
-    exclude: .errcheck.txt
+    exclude-functions:
+      - (*github.com/tektoncd/pipeline/vendor/go.uber.org/zap.SugaredLogger).Sync
+      - flag.Set
+      - os.Setenv
+      - logger.Sync
+      - fmt.Fprintf
+      - fmt.Fprintln
+      - (io.Closer).Close
+      - updateConfigMap
   staticcheck:
     checks:
       - '-SA1019' # ignore ClusterTask warning
diff --git a/Makefile b/Makefile
index 461f0e853..ae0852ca9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 GO   = go
-PKGS = $(or $(PKG),$(shell env GO111MODULE=on $(GO) list ./... | grep -v 'github\.com\/tektoncd\/cli\/third_party\/'))
+PKGS = $(or $(PKG),$(shell env GO111MODULE=on $(GO) list ./... | grep -v 'github.com/tektoncd/cli/third_party/'))
 BIN  = $(CURDIR)/.bin
 
 export GO111MODULE=on
@@ -11,7 +11,7 @@ M = $(shell printf "\033[34;1m🐱\033[0m")
 TIMEOUT_UNIT = 5m
 TIMEOUT_E2E  = 20m
 
-GOLANGCI_VERSION = v1.56.2
+GOLANGCI_VERSION = v1.58.0
 
 YAML_FILES := $(shell find . -type f -regex ".*y[a]ml" -print)
 
diff --git a/tekton/release-pipeline.yml b/tekton/release-pipeline.yml
index 710e115c9..dcf675cdf 100644
--- a/tekton/release-pipeline.yml
+++ b/tekton/release-pipeline.yml
@@ -54,7 +54,7 @@ spec:
         - name: flags
           value: "-v --timeout 20m"
         - name: version
-          value: v1.56.2
+          value: v1.58.0
       workspaces:
         - name: source
           workspace: shared-workspace