diff --git a/util/argo/normalizers/knowntypes_normalizer_test.go b/util/argo/normalizers/knowntypes_normalizer_test.go
index d91cdef50a..c464e1847d 100644
--- a/util/argo/normalizers/knowntypes_normalizer_test.go
+++ b/util/argo/normalizers/knowntypes_normalizer_test.go
@@ -275,7 +275,7 @@ func TestOverrideKeyWithoutGroup(t *testing.T) {
 func TestKnownTypes(t *testing.T) {
 	typesData, err := os.ReadFile("./diffing_known_types.txt")
 	require.NoError(t, err)
-	for _, typeName := range strings.Split(string(typesData), "\n") {
+	for typeName := range strings.SplitSeq(string(typesData), "\n") {
 		if typeName = strings.TrimSpace(typeName); typeName == "" {
 			continue
 		}
diff --git a/util/db/certificate.go b/util/db/certificate.go
index 2b63768168..24889efa55 100644
--- a/util/db/certificate.go
+++ b/util/db/certificate.go
@@ -218,7 +218,7 @@ func (db *db) CreateRepoCertificate(ctx context.Context, certificates *appsv1.Re
 			}
 
 			// Make sure that we received a valid public host key by parsing it
-			_, hostnames, rawKeyData, _, _, err := ssh.ParseKnownHosts([]byte(fmt.Sprintf("%s %s %s", certificate.ServerName, certificate.CertSubType, certificate.CertData)))
+			_, hostnames, rawKeyData, _, _, err := ssh.ParseKnownHosts(fmt.Appendf(nil, "%s %s %s", certificate.ServerName, certificate.CertSubType, certificate.CertData))
 			if err != nil {
 				return nil, err
 			}
diff --git a/util/db/cluster.go b/util/db/cluster.go
index 831dadf646..f5742776f1 100644
--- a/util/db/cluster.go
+++ b/util/db/cluster.go
@@ -405,7 +405,7 @@ func SecretToCluster(s *corev1.Secret) (*appv1.Cluster, error) {
 	}
 
 	var namespaces []string
-	for _, ns := range strings.Split(string(s.Data["namespaces"]), ",") {
+	for ns := range strings.SplitSeq(string(s.Data["namespaces"]), ",") {
 		if ns = strings.TrimSpace(ns); ns != "" {
 			namespaces = append(namespaces, ns)
 		}
diff --git a/util/rbac/rbac.go b/util/rbac/rbac.go
index ac50ac45ae..1d555341a3 100644
--- a/util/rbac/rbac.go
+++ b/util/rbac/rbac.go
@@ -570,7 +570,7 @@ func newAdapter(builtinPolicy, userDefinedPolicy, runtimePolicy string) *argocdA
 
 func (a *argocdAdapter) LoadPolicy(model model.Model) error {
 	for _, policyStr := range []string{a.builtinPolicy, a.userDefinedPolicy, a.runtimePolicy} {
-		for _, line := range strings.Split(policyStr, "\n") {
+		for line := range strings.SplitSeq(policyStr, "\n") {
 			if err := loadPolicyLine(strings.TrimSpace(line), model); err != nil {
 				return err
 			}
diff --git a/util/session/sessionmanager_norace_test.go b/util/session/sessionmanager_norace_test.go
index 083074fae1..5271ed665e 100644
--- a/util/session/sessionmanager_norace_test.go
+++ b/util/session/sessionmanager_norace_test.go
@@ -1,5 +1,4 @@
 //go:build !race
-// +build !race
 
 package session
 
@@ -27,7 +26,7 @@ func TestRandomPasswordVerificationDelay(t *testing.T) {
 	mgr.sleep = func(d time.Duration) {
 		sleptFor = d
 	}
-	for i := 0; i < 10; i++ {
+	for range 10 {
 		sleptFor = 0
 		start := time.Now()
 		require.NoError(t, mgr.VerifyUsernamePassword("admin", "password"))
diff --git a/util/settings/cluster_informer.go b/util/settings/cluster_informer.go
index ac4f69d4e7..8f8e6689bc 100644
--- a/util/settings/cluster_informer.go
+++ b/util/settings/cluster_informer.go
@@ -177,7 +177,7 @@ func secretToCluster(s *corev1.Secret) (*appv1.Cluster, error) {
 	}
 
 	var namespaces []string
-	for _, ns := range strings.Split(string(s.Data["namespaces"]), ",") {
+	for ns := range strings.SplitSeq(string(s.Data["namespaces"]), ",") {
 		if ns = strings.TrimSpace(ns); ns != "" {
 			namespaces = append(namespaces, ns)
 		}
diff --git a/util/templates/normalizers.go b/util/templates/normalizers.go
index 8dcbc31bef..d76219b4f8 100644
--- a/util/templates/normalizers.go
+++ b/util/templates/normalizers.go
@@ -25,7 +25,7 @@ func (s normalizer) trim() normalizer {
 
 func (s normalizer) indent() normalizer {
 	indentedLines := []string{}
-	for _, line := range strings.Split(s.string, "\n") {
+	for line := range strings.SplitSeq(s.string, "\n") {
 		trimmed := strings.TrimSpace(line)
 		indented := Indentation + trimmed
 		indentedLines = append(indentedLines, indented)