diff --git a/devenv/docker/blocks/alert_webhook_listener/main.go b/devenv/docker/blocks/alert_webhook_listener/main.go
index 4cf9e83a585..399628249ae 100644
--- a/devenv/docker/blocks/alert_webhook_listener/main.go
+++ b/devenv/docker/blocks/alert_webhook_listener/main.go
@@ -14,7 +14,7 @@ func hello(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	safeBody := strings.Replace(string(body), "\n", "", -1)
+	safeBody := strings.ReplaceAll(string(body), "\n", "")
 	line := fmt.Sprintf("webbhook: -> %s", safeBody)
 	fmt.Println(line)
 	if _, err := io.WriteString(w, line); err != nil {
diff --git a/devenv/docker/blocks/slow_proxy/main.go b/devenv/docker/blocks/slow_proxy/main.go
index 4f83fc5fc5e..d6a655521fc 100644
--- a/devenv/docker/blocks/slow_proxy/main.go
+++ b/devenv/docker/blocks/slow_proxy/main.go
@@ -32,8 +32,8 @@ func main() {
 	proxy := httputil.NewSingleHostReverseProxy(originURL)
 
 	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
-		safeSleep := strings.Replace(sleep.String(), "\n", "", -1)
-		safeRequestUri := strings.Replace(r.RequestURI, "\n", "", -1)
+		safeSleep := strings.ReplaceAll(sleep.String(), "\n", "")
+		safeRequestUri := strings.ReplaceAll(r.RequestURI, "\n", "")
 		log.Printf("sleeping for %s then proxying request: url '%s'", safeSleep, safeRequestUri)
 
 		// This is commented out as CodeQL flags this as vulnerability CWE-117 (https://cwe.mitre.org/data/definitions/117.html)
diff --git a/pkg/build/version.go b/pkg/build/version.go
index 9ecb6b5b972..d01e16ea368 100644
--- a/pkg/build/version.go
+++ b/pkg/build/version.go
@@ -58,7 +58,7 @@ func LinuxPackageVersion(v string, buildID string) (string, string) {
 }
 
 func shortenBuildID(buildID string) string {
-	buildID = strings.Replace(buildID, "-", "", -1)
+	buildID = strings.ReplaceAll(buildID, "-", "")
 	if len(buildID) < 9 {
 		return buildID
 	}
diff --git a/pkg/services/accesscontrol/models.go b/pkg/services/accesscontrol/models.go
index b4b77b1225b..143e9f8845a 100644
--- a/pkg/services/accesscontrol/models.go
+++ b/pkg/services/accesscontrol/models.go
@@ -165,7 +165,7 @@ func (r RoleDTO) MarshalJSON() ([]byte, error) {
 func fallbackDisplayName(rName string) string {
 	// removing prefix for fixed roles
 	rNameWithoutPrefix := strings.Replace(rName, FixedRolePrefix, "", 1)
-	return strings.TrimSpace(strings.Replace(rNameWithoutPrefix, ":", " ", -1))
+	return strings.TrimSpace(strings.ReplaceAll(rNameWithoutPrefix, ":", " "))
 }
 
 type TeamRole struct {
diff --git a/pkg/tsdb/cloudwatch/models/cloudwatch_query.go b/pkg/tsdb/cloudwatch/models/cloudwatch_query.go
index 906100693fd..248796e35b5 100644
--- a/pkg/tsdb/cloudwatch/models/cloudwatch_query.go
+++ b/pkg/tsdb/cloudwatch/models/cloudwatch_query.go
@@ -290,7 +290,7 @@ func (q *CloudWatchQuery) validateAndSetDefaults(refId string, metricsDataQuery
 		suffix := refId
 		if !validMetricDataID.MatchString(suffix) {
 			newUUID := uuid.NewString()
-			suffix = strings.Replace(newUUID, "-", "", -1)
+			suffix = strings.ReplaceAll(newUUID, "-", "")
 		}
 		q.Id = fmt.Sprintf("query%s", suffix)
 	}
@@ -436,8 +436,8 @@ func parseDimensions(dimensions map[string]interface{}) (map[string][]string, er
 }
 
 func sortDimensions(dimensions map[string][]string) map[string][]string {
-	sortedDimensions := make(map[string][]string)
-	var keys []string
+	sortedDimensions := make(map[string][]string, len(dimensions))
+	keys := make([]string, 0, len(dimensions))
 	for k := range dimensions {
 		keys = append(keys, k)
 	}
diff --git a/pkg/web/tree.go b/pkg/web/tree.go
index b81fa0f4bc2..5d4a6e46b93 100644
--- a/pkg/web/tree.go
+++ b/pkg/web/tree.go
@@ -96,8 +96,8 @@ func getWildcards(pattern string) (string, []string) {
 
 // getRawPattern removes all regexp but keeps wildcards for building URL path.
 func getRawPattern(rawPattern string) string {
-	rawPattern = strings.Replace(rawPattern, ":int", "", -1)
-	rawPattern = strings.Replace(rawPattern, ":string", "", -1)
+	rawPattern = strings.ReplaceAll(rawPattern, ":int", "")
+	rawPattern = strings.ReplaceAll(rawPattern, ":string", "")
 
 	for {
 		startIdx := strings.Index(rawPattern, "(")