diff --git a/cmd/generate/generate.go b/cmd/generate/generate.go
index 2173ca10ff..271cf32f39 100644
--- a/cmd/generate/generate.go
+++ b/cmd/generate/generate.go
@@ -24,7 +24,8 @@ import (
 )
 
 var (
-	backend string
+	backend     string
+	backendType string
 )
 
 // generateCmd represents the auth command
@@ -34,14 +35,13 @@ var GenerateCmd = &cobra.Command{
 	Long:  `Opens your browser to generate a key for your chosen backend.`,
 	Run: func(cmd *cobra.Command, args []string) {
 
-		backendType := viper.GetString("backend_type")
+		backendType = viper.GetString("backend_type")
 		if backendType == "" {
 			// Set the default backend
 			backend = "openai"
 		}
 		// override the default backend if a flag is provided
 		if backend != "" {
-			//nolint:all
 			backendType = backend
 		}
 		fmt.Println("")
diff --git a/cmd/serve/serve.go b/cmd/serve/serve.go
index 36b7a2a3ae..ed0506fea0 100644
--- a/cmd/serve/serve.go
+++ b/cmd/serve/serve.go
@@ -120,7 +120,12 @@ var ServeCmd = &cobra.Command{
 			color.Red("failed to create logger: %v", err)
 			os.Exit(1)
 		}
-		defer logger.Sync()
+		defer func() {
+			if err := logger.Sync(); err != nil {
+				color.Red("failed to sync logger: %v", err)
+				os.Exit(1)
+			}
+		}()
 
 		server := k8sgptserver.Config{
 			Backend:     aiProvider.Name,
diff --git a/pkg/analyzer/gateway_test.go b/pkg/analyzer/gateway_test.go
index 920144871d..57deea3e34 100644
--- a/pkg/analyzer/gateway_test.go
+++ b/pkg/analyzer/gateway_test.go
@@ -56,10 +56,15 @@ func TestGatewayAnalyzer(t *testing.T) {
 	Gateway := BuildGateway(ClassName, AcceptedStatus)
 	// Create a Gateway Analyzer instance with the fake client
 	scheme := scheme.Scheme
-	//nolint:all
-	gtwapi.Install(scheme)
-	//nolint:all
-	apiextensionsv1.AddToScheme(scheme)
+
+	err := gtwapi.Install(scheme)
+	if err != nil {
+		t.Error(err)
+	}
+	err = apiextensionsv1.AddToScheme(scheme)
+	if err != nil {
+		t.Error(err)
+	}
 	objects := []runtime.Object{
 		&Gateway,
 		&GatewayClass,
@@ -90,9 +95,14 @@ func TestMissingClassGatewayAnalyzer(t *testing.T) {
 
 	// Create a Gateway Analyzer instance with the fake client
 	scheme := scheme.Scheme
-	//nolint:all
-	gtwapi.Install(scheme)
-	apiextensionsv1.AddToScheme(scheme)
+	err := gtwapi.Install(scheme)
+	if err != nil {
+		t.Error(err)
+	}
+	err = apiextensionsv1.AddToScheme(scheme)
+	if err != nil {
+		t.Error(err)
+	}
 	objects := []runtime.Object{
 		&Gateway,
 	}
@@ -124,8 +134,14 @@ func TestStatusGatewayAnalyzer(t *testing.T) {
 
 	// Create a Gateway Analyzer instance with the fake client
 	scheme := scheme.Scheme
-	gtwapi.Install(scheme)
-	apiextensionsv1.AddToScheme(scheme)
+	err := gtwapi.Install(scheme)
+	if err != nil {
+		t.Error(err)
+	}
+	err = apiextensionsv1.AddToScheme(scheme)
+	if err != nil {
+		t.Error(err)
+	}
 	objects := []runtime.Object{
 		&Gateway,
 		&GatewayClass,
diff --git a/pkg/analyzer/gatewayclass.go b/pkg/analyzer/gatewayclass.go
index 50a58eff59..fb516766a5 100644
--- a/pkg/analyzer/gatewayclass.go
+++ b/pkg/analyzer/gatewayclass.go
@@ -35,7 +35,10 @@ func (GatewayClassAnalyzer) Analyze(a common.Analyzer) ([]common.Result, error)
 
 	gcList := &gtwapi.GatewayClassList{}
 	client := a.Client.CtrlClient
-	gtwapi.AddToScheme(client.Scheme())
+	err := gtwapi.AddToScheme(client.Scheme())
+	if err != nil {
+		return nil, err
+	}
 	if err := client.List(a.Context, gcList, &ctrl.ListOptions{}); err != nil {
 		return nil, err
 	}
diff --git a/pkg/analyzer/gatewayclass_test.go b/pkg/analyzer/gatewayclass_test.go
index 1f1604a98c..37a40951ee 100644
--- a/pkg/analyzer/gatewayclass_test.go
+++ b/pkg/analyzer/gatewayclass_test.go
@@ -29,8 +29,14 @@ func TestGatewayClassAnalyzer(t *testing.T) {
 	GatewayClass.Status.Conditions = []metav1.Condition{BadCondition}
 	// Create a GatewayClassAnalyzer instance with the fake client
 	scheme := scheme.Scheme
-	gtwapi.Install(scheme)
-	apiextensionsv1.AddToScheme(scheme)
+	err := gtwapi.Install(scheme)
+	if err != nil {
+		t.Error(err)
+	}
+	err = apiextensionsv1.AddToScheme(scheme)
+	if err != nil {
+		t.Error(err)
+	}
 
 	fakeClient := fakeclient.NewClientBuilder().WithScheme(scheme).WithRuntimeObjects(GatewayClass).Build()
 
diff --git a/pkg/analyzer/httproute.go b/pkg/analyzer/httproute.go
index 5d6e0a58c3..18cfebb944 100644
--- a/pkg/analyzer/httproute.go
+++ b/pkg/analyzer/httproute.go
@@ -38,7 +38,10 @@ func (HTTPRouteAnalyzer) Analyze(a common.Analyzer) ([]common.Result, error) {
 	gtw := &gtwapi.Gateway{}
 	service := &corev1.Service{}
 	client := a.Client.CtrlClient
-	gtwapi.AddToScheme(client.Scheme())
+	err := gtwapi.AddToScheme(client.Scheme())
+	if err != nil {
+		return nil, err
+	}
 	if err := client.List(a.Context, routeList, &ctrl.ListOptions{}); err != nil {
 		return nil, err
 	}
diff --git a/pkg/analyzer/httproute_test.go b/pkg/analyzer/httproute_test.go
index b2f914110b..6d71b364d5 100644
--- a/pkg/analyzer/httproute_test.go
+++ b/pkg/analyzer/httproute_test.go
@@ -104,8 +104,14 @@ func TestGWMissiningHTTRouteAnalyzer(t *testing.T) {
 	HTTPRoute := BuildHTTPRoute(backendName, gtwName, gtwNamespace, &svcPort, httpRouteNamespace)
 	// Create a Gateway Analyzer instance with the fake client
 	scheme := scheme.Scheme
-	gtwapi.Install(scheme)
-	apiextensionsv1.AddToScheme(scheme)
+	err := gtwapi.Install(scheme)
+	if err != nil {
+		t.Error(err)
+	}
+	err = apiextensionsv1.AddToScheme(scheme)
+	if err != nil {
+		t.Error(err)
+	}
 	objects := []runtime.Object{
 		&HTTPRoute,
 	}
@@ -156,8 +162,14 @@ func TestGWConfigSameHTTRouteAnalyzer(t *testing.T) {
 	Gateway := BuildRouteGateway("differentnamespace", "gatewayname", "Same")
 	// Create a Gateway Analyzer instance with the fake client
 	scheme := scheme.Scheme
-	gtwapi.Install(scheme)
-	apiextensionsv1.AddToScheme(scheme)
+	err := gtwapi.Install(scheme)
+	if err != nil {
+		t.Error(err)
+	}
+	err = apiextensionsv1.AddToScheme(scheme)
+	if err != nil {
+		t.Error(err)
+	}
 	objects := []runtime.Object{
 		&HTTPRoute,
 		&Gateway,
@@ -207,8 +219,14 @@ func TestGWConfigSelectorHTTRouteAnalyzer(t *testing.T) {
 	Gateway := BuildRouteGateway("default", "gatewayname", "Selector")
 	// Create a Gateway Analyzer instance with the fake client
 	scheme := scheme.Scheme
-	gtwapi.Install(scheme)
-	apiextensionsv1.AddToScheme(scheme)
+	err := gtwapi.Install(scheme)
+	if err != nil {
+		t.Error(err)
+	}
+	err = apiextensionsv1.AddToScheme(scheme)
+	if err != nil {
+		t.Error(err)
+	}
 	objects := []runtime.Object{
 		&HTTPRoute,
 		&Gateway,
@@ -259,8 +277,14 @@ func TestSvcMissingHTTRouteAnalyzer(t *testing.T) {
 	Gateway := BuildRouteGateway("default", "gatewayname", "Same")
 	// Create a Gateway Analyzer instance with the fake client
 	scheme := scheme.Scheme
-	gtwapi.Install(scheme)
-	apiextensionsv1.AddToScheme(scheme)
+	err := gtwapi.Install(scheme)
+	if err != nil {
+		t.Error(err)
+	}
+	err = apiextensionsv1.AddToScheme(scheme)
+	if err != nil {
+		t.Error(err)
+	}
 	objects := []runtime.Object{
 		&HTTPRoute,
 		&Gateway,
@@ -332,8 +356,14 @@ func TestSvcDifferentPortHTTRouteAnalyzer(t *testing.T) {
 	Gateway := BuildRouteGateway("default", "gatewayname", "Same")
 	// Create a Gateway Analyzer instance with the fake client
 	scheme := scheme.Scheme
-	gtwapi.Install(scheme)
-	apiextensionsv1.AddToScheme(scheme)
+	err := gtwapi.Install(scheme)
+	if err != nil {
+		t.Error(err)
+	}
+	err = apiextensionsv1.AddToScheme(scheme)
+	if err != nil {
+		t.Error(err)
+	}
 	objects := []runtime.Object{
 		&HTTPRoute,
 		&Gateway,
diff --git a/pkg/integration/prometheus/config_analyzer.go b/pkg/integration/prometheus/config_analyzer.go
index 3629244d35..bc98e9e67e 100644
--- a/pkg/integration/prometheus/config_analyzer.go
+++ b/pkg/integration/prometheus/config_analyzer.go
@@ -192,10 +192,10 @@ func findPrometheusConfigPath(ctx context.Context, client kubernetes.Interface,
 			// references the ConfigMap or Secret volume mount.
 			// Fallback to the prometheus container if that's not found.
 			if strings.HasPrefix(arg, prometheusConfigFlag) {
-				path = strings.TrimLeft(arg, prometheusConfigFlag)
+				path = strings.TrimPrefix(arg, prometheusConfigFlag)
 			}
 			if strings.HasPrefix(arg, configReloaderConfigFlag) {
-				path = strings.TrimLeft(arg, configReloaderConfigFlag)
+				path = strings.TrimPrefix(arg, configReloaderConfigFlag)
 			}
 		}
 		if container.Name == configReloaderContainerName {
diff --git a/pkg/server/integration.go b/pkg/server/integration.go
index 9542916721..81fcb5ae06 100644
--- a/pkg/server/integration.go
+++ b/pkg/server/integration.go
@@ -38,6 +38,9 @@ func (h *handler) syncIntegration(ctx context.Context,
 		activeFilters = coreFilters
 	}
 	var err error = status.Error(codes.OK, "")
+	if err != nil {
+		fmt.Println(err)
+	}
 	deactivateFunc := func(integrationRef integration.IIntegration) error {
 		namespace, err := integrationRef.GetNamespace()
 		if err != nil {
@@ -125,6 +128,9 @@ func (*handler) deactivateAllIntegrations(integrationProvider *integration.Integ
 		b, _ := integrationProvider.IsActivate(i)
 		if b {
 			in, err := integrationProvider.Get(i)
+			if err != nil {
+				return err
+			}
 			namespace, err := in.GetNamespace()
 			if err != nil {
 				return err
diff --git a/pkg/server/server.go b/pkg/server/server.go
index d0099e4ef3..083ff164e3 100644
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -41,7 +41,6 @@ type Config struct {
 	listener      net.Listener
 }
 
-//nolint:unused
 type Health struct {
 	Status  string `json:"status"`
 	Success int    `json:"success"`
diff --git a/pkg/server/server_test.go b/pkg/server/server_test.go
index ce6d684796..49994723f2 100644
--- a/pkg/server/server_test.go
+++ b/pkg/server/server_test.go
@@ -2,7 +2,6 @@ package server
 
 import (
 	"os"
-	"sync"
 	"testing"
 
 	"github.com/fatih/color"
@@ -25,19 +24,15 @@ func TestServerInit(t *testing.T) {
 		Token:       "none",
 		Logger:      logger,
 	}
-	var wg sync.WaitGroup
 
 	go func() {
-		wg.Add(1)
 		err := server_config.Serve()
 		if err != nil {
 			assert.Fail(t, "serve: %s", err.Error())
 		}
-		server_config.Shutdown()
+		err = server_config.Shutdown()
 		if err != nil {
 			assert.Fail(t, "shutdown: %s", err.Error())
 		}
-		wg.Done()
 	}()
-	wg.Wait()
 }