diff --git a/internal/pushrules/util.go b/internal/pushrules/util.go
index e2821b57a..4979bbd2a 100644
--- a/internal/pushrules/util.go
+++ b/internal/pushrules/util.go
@@ -61,8 +61,8 @@ func globToRegexp(pattern string) (*regexp.Regexp, error) {
 	// characters, which makes this a straight-forward
 	// replace-after-quote.
 	pattern = globNonMetaRegexp.ReplaceAllStringFunc(pattern, regexp.QuoteMeta)
-	pattern = strings.Replace(pattern, "*", ".*", -1)
-	pattern = strings.Replace(pattern, "?", ".", -1)
+	pattern = strings.ReplaceAll(pattern, "*", ".*")
+	pattern = strings.ReplaceAll(pattern, "?", ".")
 	return regexp.Compile("^(" + pattern + ")$")
 }
 
diff --git a/syncapi/storage/postgres/filtering.go b/syncapi/storage/postgres/filtering.go
index 0d9271332..a4160d7e8 100644
--- a/syncapi/storage/postgres/filtering.go
+++ b/syncapi/storage/postgres/filtering.go
@@ -25,7 +25,7 @@ func filterConvertTypeWildcardToSQL(values *[]string) []string {
 	v := *values
 	ret := make([]string, len(v))
 	for i := range v {
-		ret[i] = strings.Replace(v[i], "*", "%", -1)
+		ret[i] = strings.ReplaceAll(v[i], "*", "%")
 	}
 	return ret
 }