diff --git a/Makefile b/Makefile
index 6bce4519..9605955c 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ coverprofile_html:
 	go tool cover -html=coverage.out
 
 lint:
-	golangci-lint run --timeout 5m
+	golangci-lint run
 
 compress: build
 	upx --brute headscale
diff --git a/grpcv1.go b/grpcv1.go
index d9bbf531..5fc2e1c8 100644
--- a/grpcv1.go
+++ b/grpcv1.go
@@ -1,3 +1,4 @@
+//nolint
 package headscale
 
 import (