diff --git a/server/channels/api4/apitestlib.go b/server/channels/api4/apitestlib.go
index 4e56583c846..b5df5501408 100644
--- a/server/channels/api4/apitestlib.go
+++ b/server/channels/api4/apitestlib.go
@@ -201,7 +201,7 @@ func setupTestHelper(dbStore store.Store, searchEngine *searchengine.Broker, ent
 	falseValues := []string{"0", "f", "F", "FALSE", "false", "False"}
 	trueString := trueValues[rand.Intn(len(trueValues))]
 	falseString := falseValues[rand.Intn(len(falseValues))]
-	mlog.Debug("Configured Client4 bool string values", mlog.String("true", trueString), mlog.String("false", falseString))
+	testLogger.Debug("Configured Client4 bool string values", mlog.String("true", trueString), mlog.String("false", falseString))
 	th.Client.SetBoolString(true, trueString)
 	th.Client.SetBoolString(false, falseString)
 
diff --git a/server/channels/api4/cloud.go b/server/channels/api4/cloud.go
index ef67e38136d..62667932765 100644
--- a/server/channels/api4/cloud.go
+++ b/server/channels/api4/cloud.go
@@ -319,7 +319,7 @@ func validateWorkspaceBusinessEmail(c *Context, w http.ResponseWriter, r *http.R
 			c.Err = model.NewAppError("Api4.validateWorkspaceBusinessEmail", "api.cloud.request_error", nil, errValidatingAdminEmail.Error(), http.StatusForbidden)
 			emailResp := model.ValidateBusinessEmailResponse{IsValid: false}
 			if err := json.NewEncoder(w).Encode(emailResp); err != nil {
-				mlog.Warn("Error while writing response", mlog.Err(err))
+				c.Logger.Warn("Error while writing response", mlog.Err(err))
 			}
 			return
 		}
@@ -328,7 +328,7 @@ func validateWorkspaceBusinessEmail(c *Context, w http.ResponseWriter, r *http.R
 	// if any of the emails is valid, return ok
 	emailResp := model.ValidateBusinessEmailResponse{IsValid: true}
 	if err := json.NewEncoder(w).Encode(emailResp); err != nil {
-		mlog.Warn("Error while writing response", mlog.Err(err))
+		c.Logger.Warn("Error while writing response", mlog.Err(err))
 	}
 }
 
diff --git a/server/channels/api4/config.go b/server/channels/api4/config.go
index 02b8bb14b0c..61220e9e2e8 100644
--- a/server/channels/api4/config.go
+++ b/server/channels/api4/config.go
@@ -428,7 +428,7 @@ func makeFilterConfigByPermission(accessType filterType) func(c *Context, struct
 					return true
 				}
 			} else {
-				mlog.Warn("Unrecognized config permissions tag value.", mlog.String("tag_value", permissionID))
+				c.Logger.Warn("Unrecognized config permissions tag value.", mlog.String("tag_value", permissionID))
 			}
 		}
 
diff --git a/server/channels/api4/handlers.go b/server/channels/api4/handlers.go
index cb440c7f91d..720a1d774c9 100644
--- a/server/channels/api4/handlers.go
+++ b/server/channels/api4/handlers.go
@@ -201,7 +201,7 @@ func (api *API) RateLimitedHandler(apiHandler http.Handler, settings model.RateL
 
 	rateLimiter, err := app.NewRateLimiter(&settings, []string{})
 	if err != nil {
-		mlog.Error("getRateLimitedHandler", mlog.Err(err))
+		api.srv.Log().Error("getRateLimitedHandler", mlog.Err(err))
 		return nil
 	}
 	return rateLimiter.RateLimitHandler(apiHandler)
diff --git a/server/channels/api4/job.go b/server/channels/api4/job.go
index d258f2479c3..eeca37c3f49 100644
--- a/server/channels/api4/job.go
+++ b/server/channels/api4/job.go
@@ -151,7 +151,7 @@ func getJobs(c *Context, w http.ResponseWriter, r *http.Request) {
 	for _, jobType := range model.AllJobTypes {
 		hasPermission, permissionRequired := c.App.SessionHasPermissionToReadJob(*c.AppContext.Session(), jobType)
 		if permissionRequired == nil {
-			mlog.Warn("The job types of a job you are trying to retrieve does not contain permissions", mlog.String("jobType", jobType))
+			c.Logger.Warn("The job types of a job you are trying to retrieve does not contain permissions", mlog.String("jobType", jobType))
 			continue
 		}
 		if hasPermission {
diff --git a/server/channels/api4/system.go b/server/channels/api4/system.go
index fb655792041..c022466d2c5 100644
--- a/server/channels/api4/system.go
+++ b/server/channels/api4/system.go
@@ -172,7 +172,7 @@ func getSystemPing(c *Context, w http.ResponseWriter, r *http.Request) {
 		}
 
 		if s[dbStatusKey] == model.StatusOk {
-			mlog.Debug("Able to write to database.")
+			c.Logger.Debug("Able to write to database.")
 		}
 
 		filestoreStatusKey := "filestore_status"
@@ -853,7 +853,7 @@ func getWarnMetricsStatus(c *Context, w http.ResponseWriter, r *http.Request) {
 
 	license := c.App.Channels().License()
 	if license != nil {
-		mlog.Debug("License is present, skip.")
+		c.Logger.Debug("License is present, skip.")
 		return
 	}
 
@@ -884,7 +884,7 @@ func sendWarnMetricAckEmail(c *Context, w http.ResponseWriter, r *http.Request)
 
 	license := c.App.Channels().License()
 	if license != nil {
-		mlog.Debug("License is present, skip.")
+		c.Logger.Debug("License is present, skip.")
 		return
 	}
 
@@ -920,13 +920,13 @@ func requestTrialLicenseAndAckWarnMetric(c *Context, w http.ResponseWriter, r *h
 	}
 
 	if model.BuildEnterpriseReady != "true" {
-		mlog.Debug("Not Enterprise Edition, skip.")
+		c.Logger.Debug("Not Enterprise Edition, skip.")
 		return
 	}
 
 	license := c.App.Channels().License()
 	if license != nil {
-		mlog.Debug("License is present, skip.")
+		c.Logger.Debug("License is present, skip.")
 		return
 	}
 
diff --git a/server/channels/api4/system_test.go b/server/channels/api4/system_test.go
index e5651d8a490..11f6bb711e8 100644
--- a/server/channels/api4/system_test.go
+++ b/server/channels/api4/system_test.go
@@ -23,7 +23,6 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/mattermost/mattermost/server/public/model"
-	"github.com/mattermost/mattermost/server/public/shared/mlog"
 	"github.com/mattermost/mattermost/server/v8/channels/utils/fileutils"
 )
 
@@ -358,7 +357,7 @@ func TestGetLogs(t *testing.T) {
 	defer th.TearDown()
 
 	for i := 0; i < 20; i++ {
-		mlog.Info(strconv.Itoa(i))
+		th.TestLogger.Info(strconv.Itoa(i))
 	}
 
 	err := th.TestLogger.Flush()
diff --git a/server/channels/api4/websocket.go b/server/channels/api4/websocket.go
index d49e7cea3cc..3f4ccc7e294 100644
--- a/server/channels/api4/websocket.go
+++ b/server/channels/api4/websocket.go
@@ -55,7 +55,7 @@ func connectWebSocket(c *Context, w http.ResponseWriter, r *http.Request) {
 	} else {
 		cfg, err = c.App.Srv().Platform().PopulateWebConnConfig(c.AppContext.Session(), cfg, r.URL.Query().Get(sequenceNumberParam))
 		if err != nil {
-			mlog.Warn("Error while populating webconn config", mlog.String("id", r.URL.Query().Get(connectionIDParam)), mlog.Err(err))
+			c.Logger.Warn("Error while populating webconn config", mlog.String("id", r.URL.Query().Get(connectionIDParam)), mlog.Err(err))
 			ws.Close()
 			return
 		}