diff --git a/cmd/argocd-application-controller/commands/argocd_application_controller.go b/cmd/argocd-application-controller/commands/argocd_application_controller.go
index 6fd1c70c301bc..5f53cfbf61d2c 100644
--- a/cmd/argocd-application-controller/commands/argocd_application_controller.go
+++ b/cmd/argocd-application-controller/commands/argocd_application_controller.go
@@ -9,6 +9,15 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/argoproj/pkg/stats"
+	"github.com/redis/go-redis/v9"
+	log "github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
+	"k8s.io/apimachinery/pkg/util/wait"
+	"k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/rest"
+	"k8s.io/client-go/tools/clientcmd"
+
 	cmdutil "github.com/argoproj/argo-cd/v2/cmd/util"
 	"github.com/argoproj/argo-cd/v2/common"
 	"github.com/argoproj/argo-cd/v2/controller"
@@ -28,14 +37,6 @@ import (
 	"github.com/argoproj/argo-cd/v2/util/settings"
 	"github.com/argoproj/argo-cd/v2/util/tls"
 	"github.com/argoproj/argo-cd/v2/util/trace"
-	"github.com/argoproj/pkg/stats"
-	"github.com/redis/go-redis/v9"
-	log "github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
-	"k8s.io/apimachinery/pkg/util/wait"
-	"k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/rest"
-	"k8s.io/client-go/tools/clientcmd"
 )
 
 const (
diff --git a/cmd/argocd-applicationset-controller/commands/applicationset_controller.go b/cmd/argocd-applicationset-controller/commands/applicationset_controller.go
index 88ffb2179728b..a50e4428dabb9 100644
--- a/cmd/argocd-applicationset-controller/commands/applicationset_controller.go
+++ b/cmd/argocd-applicationset-controller/commands/applicationset_controller.go
@@ -73,7 +73,7 @@ type ApplicationSetControllerConfig struct {
 	allowedScmProviders          []string
 	globalPreservedAnnotations   []string
 	globalPreservedLabels        []string
-	metricsApplicationsetLabels   []string
+	metricsApplicationsetLabels  []string
 	enableScmProviders           bool
 	webhookParallelism           int
 	tokenRefStrictMode           bool
diff --git a/cmd/argocd-repo-server/commands/argocd_repo_server.go b/cmd/argocd-repo-server/commands/argocd_repo_server.go
index e3adc2175539c..88fc0f34b9c6e 100644
--- a/cmd/argocd-repo-server/commands/argocd_repo_server.go
+++ b/cmd/argocd-repo-server/commands/argocd_repo_server.go
@@ -72,8 +72,8 @@ type RepoServerConfig struct {
 	pauseGenerationOnFailureForMinutes           int
 	pauseGenerationOnFailureForRequests          int
 	gitSubmoduleEnabled                          bool
-	includeHiddenDirectories          bool
-	cmpUseManifestGeneratePaths       bool
+	includeHiddenDirectories                     bool
+	cmpUseManifestGeneratePaths                  bool
 }
 
 func NewRepoServerConfig(cmd *cobra.Command) *RepoServerConfig {
diff --git a/cmd/argocd-server/commands/argocd_server.go b/cmd/argocd-server/commands/argocd_server.go
index 3ffe899e20fa1..346251a381b9f 100644
--- a/cmd/argocd-server/commands/argocd_server.go
+++ b/cmd/argocd-server/commands/argocd_server.go
@@ -7,9 +7,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/argoproj/argo-cd/v2/util/argo"
 	"k8s.io/client-go/rest"
 
+	"github.com/argoproj/argo-cd/v2/util/argo"
+
 	"github.com/redis/go-redis/v9"
 	"k8s.io/apimachinery/pkg/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
diff --git a/test/e2e/fixture/fixture.go b/test/e2e/fixture/fixture.go
index 60824fd8350b5..cbd859864acad 100644
--- a/test/e2e/fixture/fixture.go
+++ b/test/e2e/fixture/fixture.go
@@ -713,18 +713,18 @@ func initTestContainers(ctx context.Context) {
 	MappedOCIRegistryPort = port.Port()
 
 	// TODO: Figure nicer way to template helm index files with the forwarded port
-	c, reader, err := e2eServer.Exec(ctx, []string{"sudo", "sed", "-i", fmt.Sprintf("s/9080/%s/g", mappedHelmHttpPort), "/tmp/argo-e2e/testdata.git/helm-repo/local/index.yaml"})
-	CheckError(err)
-
-	c, reader, err = e2eServer.Exec(ctx, []string{"sudo", "sed", "-i", fmt.Sprintf("s/9080/%s/g", mappedHelmHttpPort), "/tmp/argo-e2e/testdata.git/helm-repo/local2/index.yaml"})
-	CheckError(err)
-
-	c, reader, err = e2eServer.Exec(ctx, []string{"sudo", "sed", "-i", fmt.Sprintf("s/9080/%s/g", mappedHelmHttpPort), "/tmp/argo-e2e/testdata.git/helm-repo/remote/index.yaml"})
+	c, reader, err := e2eServer.Exec(ctx, []string{
+		"sudo", "sed", "-i",
+		fmt.Sprintf("s/9080/%s/g", mappedHelmHttpPort),
+		"/tmp/argo-e2e/testdata.git/helm-repo/local/index.yaml",
+		"/tmp/argo-e2e/testdata.git/helm-repo/local2/index.yaml",
+		"/tmp/argo-e2e/testdata.git/helm-repo/remote/index.yaml",
+	})
 	CheckError(err)
 
 	if c != 0 {
 		buf := new(strings.Builder)
-		_, err = io.Copy(buf, reader)
+		_, _ = io.Copy(buf, reader)
 		panic(buf.String())
 	}