diff --git a/server/application/logs.go b/server/application/logs.go
index b52eef81e2..1fceb27fb7 100644
--- a/server/application/logs.go
+++ b/server/application/logs.go
@@ -44,7 +44,7 @@ func parseLogsStream(podName string, stream io.ReadCloser, ch chan logEntry) {
 		}
 
 		lines := strings.Join(parts[1:], " ")
-		for _, line := range strings.Split(lines, "\r") {
+		for line := range strings.SplitSeq(lines, "\r") {
 			ch <- logEntry{line: line, timeStamp: logTime, podName: podName}
 		}
 	}
diff --git a/server/applicationset/applicationset.go b/server/applicationset/applicationset.go
index 35e52d76c5..97db9fd437 100644
--- a/server/applicationset/applicationset.go
+++ b/server/applicationset/applicationset.go
@@ -278,7 +278,7 @@ func (s *Server) updateAppSet(ctx context.Context, appset *v1alpha1.ApplicationS
 		}
 	}
 
-	for i := 0; i < 10; i++ {
+	for range 10 {
 		appset.Spec = newAppset.Spec
 		if merge {
 			appset.Labels = collections.Merge(appset.Labels, newAppset.Labels)
diff --git a/server/cluster/cluster_test.go b/server/cluster/cluster_test.go
index c9d55bc0bf..c5dd871054 100644
--- a/server/cluster/cluster_test.go
+++ b/server/cluster/cluster_test.go
@@ -682,8 +682,6 @@ func TestListCluster(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		tt := tt
-
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 
diff --git a/server/extension/extension_test.go b/server/extension/extension_test.go
index b267cb53bf..b83a56e63d 100644
--- a/server/extension/extension_test.go
+++ b/server/extension/extension_test.go
@@ -210,7 +210,6 @@ func TestRegisterExtensions(t *testing.T) {
 
 		// when
 		for _, tc := range cases {
-			tc := tc
 			t.Run(tc.name, func(t *testing.T) {
 				// given
 				t.Parallel()
diff --git a/server/project/project.go b/server/project/project.go
index 3b6cc41849..a7d4714956 100644
--- a/server/project/project.go
+++ b/server/project/project.go
@@ -547,7 +547,7 @@ func (s *Server) NormalizeProjs() error {
 		return status.Errorf(codes.Internal, "Error retrieving project list: %s", err.Error())
 	}
 	for _, proj := range projList.Items {
-		for i := 0; i < 3; i++ {
+		for i := range 3 {
 			if !proj.NormalizeJWTTokens() {
 				break
 			}
diff --git a/server/server_norace_test.go b/server/server_norace_test.go
index dcbdf12be6..c08382f23f 100644
--- a/server/server_norace_test.go
+++ b/server/server_norace_test.go
@@ -1,5 +1,4 @@
 //go:build !race
-// +build !race
 
 package server
 
diff --git a/server/session/ratelimiter_test.go b/server/session/ratelimiter_test.go
index 0c2a19034c..0d73aae824 100644
--- a/server/session/ratelimiter_test.go
+++ b/server/session/ratelimiter_test.go
@@ -13,7 +13,7 @@ import (
 func TestRateLimiter(t *testing.T) {
 	var closers []utilio.Closer
 	limiter := NewLoginRateLimiter(10)
-	for i := 0; i < 10; i++ {
+	for range 10 {
 		closer, err := limiter()
 		require.NoError(t, err)
 		closers = append(closers, closer)