diff --git a/Makefile b/Makefile
index 9f0e013a0e..3955ae4847 100644
--- a/Makefile
+++ b/Makefile
@@ -98,7 +98,7 @@ vet:
 ## lint: Run go lint against code.
 .PHONY: lint
 lint:
-	@golangci-lint run -v ./...
+	@golangci-lint run -v --timeout=5m ./...
 
 ## style: Code style -> fmt,vet,lint
 .PHONY: style
diff --git a/pkg/ai/azureopenai.go b/pkg/ai/azureopenai.go
index 292bfbd1d9..61cb12f7b2 100644
--- a/pkg/ai/azureopenai.go
+++ b/pkg/ai/azureopenai.go
@@ -17,7 +17,7 @@ type AzureAIClient struct {
 	client         *openai.Client
 	model          string
 	temperature    float32
-	organizationId string
+	// organizationId string
 }
 
 func (c *AzureAIClient) Configure(config IAIConfig) error {
diff --git a/pkg/ai/openai.go b/pkg/ai/openai.go
index 727d39ec23..a4bb42a5f2 100644
--- a/pkg/ai/openai.go
+++ b/pkg/ai/openai.go
@@ -31,7 +31,7 @@ type OpenAIClient struct {
 	model          string
 	temperature    float32
 	topP           float32
-	organizationId string
+	// organizationId string
 }
 
 const (
diff --git a/pkg/custom/client.go b/pkg/custom/client.go
index c95cd7688e..8829f07d65 100644
--- a/pkg/custom/client.go
+++ b/pkg/custom/client.go
@@ -17,6 +17,7 @@ type Client struct {
 
 func NewClient(c Connection) (*Client, error) {
 
+	//nolint:staticcheck // Ignoring SA1019 for compatibility reasons
 	conn, err := grpc.Dial(fmt.Sprintf("%s:%s", c.Url, c.Port), grpc.WithTransportCredentials(insecure.NewCredentials()))
 
 	if err != nil {
diff --git a/pkg/server/server.go b/pkg/server/server.go
index c20facc8af..b30cc508f6 100644
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -26,8 +26,9 @@ import (
 	"net/http"
 	"strings"
 	"time"
-
+	//nolint:staticcheck // Ignoring SA1019 for compatibility reasons
 	gw2 "buf.build/gen/go/k8sgpt-ai/k8sgpt/grpc-ecosystem/gateway/v2/schema/v1/server_analyzer_service/schemav1gateway"
+	//nolint:staticcheck // Ignoring SA1019 for compatibility reasons
 	gw "buf.build/gen/go/k8sgpt-ai/k8sgpt/grpc-ecosystem/gateway/v2/schema/v1/server_config_service/schemav1gateway"
 	rpc "buf.build/gen/go/k8sgpt-ai/k8sgpt/grpc/go/schema/v1/schemav1grpc"
 	"github.com/go-logr/zapr"