diff --git a/.golangci.yml b/.golangci.yml
index 18f63cf99..9b14a7fc9 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,5 +1,5 @@
 run:
-  deadline: 4m
+  timeout: 5m
   skip-dirs:
   skip-files:
 
diff --git a/Makefile b/Makefile
index c2baaadfe..d476bcc3a 100644
--- a/Makefile
+++ b/Makefile
@@ -53,8 +53,8 @@ test: test-style
 	go vet $(GO_FILES)
 test-style: setup
 	@echo "==> Running static validations and linters <=="
-	# Setting deadline to 5m as deafult is 1m
-	golangci-lint run --deadline=5m
+	# Setting timeout to 5m as deafult is 1m
+	golangci-lint run --timeout=5m
 sanity-test:
 	go test -v ./test/sanity
 build: setup
@@ -72,7 +72,7 @@ setup: clean
 	$Q go env
 
 ifndef HAS_GOLANGCI
-	curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(GOPATH)/bin v1.19.1
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOPATH)/bin v1.30.0
 endif
 
 .PHONY: mod