diff --git a/.golangci.yaml b/.golangci.yaml
new file mode 100644
index 000000000..a4af821fe
--- /dev/null
+++ b/.golangci.yaml
@@ -0,0 +1,38 @@
+run:
+  timeout: 10m
+  allow-parallel-runners: true
+
+linters:
+  disable-all: true
+  enable:
+  - asasalint
+  - asciicheck
+  - bidichk
+  - bodyclose
+  - containedctx
+  - dupword
+  - durationcheck
+  - errcheck
+  - errchkjson
+  - exportloopref
+  - gocritic
+  - godot
+  - gofmt
+  - goprintffuncname
+  - gosec
+  - gosimple
+  - govet
+  - importas
+  - ineffassign
+  - misspell
+  - nilerr
+  - noctx
+  - nolintlint
+  - nosprintfhostport
+  - prealloc
+  - revive
+  - staticcheck
+  - unconvert
+  - unused
+  - usestdlibvars
+  - whitespace
diff --git a/Makefile b/Makefile
index 40bf0c6c9..0cd9c18cb 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ CONTROLLER_GEN_BIN := controller-gen
 CONTROLLER_GEN := $(GOBIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER)
 export CONTROLLER_GEN
 
-GOLANGCI_LINT_VER := v1.49.0
+GOLANGCI_LINT_VER := v1.54.2
 GOLANGCI_LINT_BIN := golangci-lint
 GOLANGCI_LINT := $(GOBIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)