diff --git a/services/web/app.js b/services/web/app.js
index 16aa07b77c..25a0cebf4d 100644
--- a/services/web/app.js
+++ b/services/web/app.js
@@ -12,7 +12,7 @@
 const metrics = require('@overleaf/metrics')
 metrics.initialize(process.env.METRICS_APP_NAME || 'web')
 const Settings = require('@overleaf/settings')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const PlansLocator = require('./app/src/Features/Subscription/PlansLocator')
 logger.initialize(process.env.METRICS_APP_NAME || 'web')
 logger.logger.serializers.user = require('./app/src/infrastructure/LoggerSerializers').user
diff --git a/services/web/app/src/Features/Analytics/AnalyticsManager.js b/services/web/app/src/Features/Analytics/AnalyticsManager.js
index 281d6a14c3..79bc56911d 100644
--- a/services/web/app/src/Features/Analytics/AnalyticsManager.js
+++ b/services/web/app/src/Features/Analytics/AnalyticsManager.js
@@ -6,7 +6,7 @@ const Queues = require('../../infrastructure/Queues')
 const uuid = require('uuid')
 const _ = require('lodash')
 const { expressify } = require('../../util/promises')
-const { logger } = require('@overleaf/logger')
+const { logger } = require('logger-sharelatex')
 
 const analyticsEventsQueue = Queues.getQueue('analytics-events')
 const analyticsEditingSessionsQueue = Queues.getQueue(
diff --git a/services/web/app/src/Features/Analytics/AnalyticsRegistrationSourceMiddleware.js b/services/web/app/src/Features/Analytics/AnalyticsRegistrationSourceMiddleware.js
index 6dc7b668d3..b1c0571355 100644
--- a/services/web/app/src/Features/Analytics/AnalyticsRegistrationSourceMiddleware.js
+++ b/services/web/app/src/Features/Analytics/AnalyticsRegistrationSourceMiddleware.js
@@ -1,4 +1,4 @@
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const OError = require('@overleaf/o-error')
 const AnalyticsRegistrationSourceHelper = require('./AnalyticsRegistrationSourceHelper')
 const SessionManager = require('../../Features/Authentication/SessionManager')
diff --git a/services/web/app/src/Features/Authentication/AuthenticationController.js b/services/web/app/src/Features/Authentication/AuthenticationController.js
index ef7318ac35..f18e8a4e91 100644
--- a/services/web/app/src/Features/Authentication/AuthenticationController.js
+++ b/services/web/app/src/Features/Authentication/AuthenticationController.js
@@ -4,7 +4,7 @@ const OError = require('@overleaf/o-error')
 const LoginRateLimiter = require('../Security/LoginRateLimiter')
 const UserUpdater = require('../User/UserUpdater')
 const Metrics = require('@overleaf/metrics')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const querystring = require('querystring')
 const Settings = require('@overleaf/settings')
 const basicAuth = require('basic-auth-connect')
diff --git a/services/web/app/src/Features/Authorization/AuthorizationMiddleware.js b/services/web/app/src/Features/Authorization/AuthorizationMiddleware.js
index 610ef4661d..8324b6aa72 100644
--- a/services/web/app/src/Features/Authorization/AuthorizationMiddleware.js
+++ b/services/web/app/src/Features/Authorization/AuthorizationMiddleware.js
@@ -1,5 +1,5 @@
 const AuthorizationManager = require('./AuthorizationManager')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const { ObjectId } = require('mongodb')
 const Errors = require('../Errors/Errors')
 const HttpErrorHandler = require('../Errors/HttpErrorHandler')
diff --git a/services/web/app/src/Features/BetaProgram/BetaProgramController.js b/services/web/app/src/Features/BetaProgram/BetaProgramController.js
index 9c29b87578..b8d8d3c49f 100644
--- a/services/web/app/src/Features/BetaProgram/BetaProgramController.js
+++ b/services/web/app/src/Features/BetaProgram/BetaProgramController.js
@@ -2,7 +2,7 @@ const BetaProgramHandler = require('./BetaProgramHandler')
 const OError = require('@overleaf/o-error')
 const UserGetter = require('../User/UserGetter')
 const Settings = require('@overleaf/settings')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const SessionManager = require('../Authentication/SessionManager')
 
 const BetaProgramController = {
diff --git a/services/web/app/src/Features/BrandVariations/BrandVariationsHandler.js b/services/web/app/src/Features/BrandVariations/BrandVariationsHandler.js
index f8ab1836b0..a135b27771 100644
--- a/services/web/app/src/Features/BrandVariations/BrandVariationsHandler.js
+++ b/services/web/app/src/Features/BrandVariations/BrandVariationsHandler.js
@@ -1,7 +1,7 @@
 const OError = require('@overleaf/o-error')
 const { URL } = require('url')
 const settings = require('@overleaf/settings')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const V1Api = require('../V1/V1Api')
 const sanitizeHtml = require('sanitize-html')
 
diff --git a/services/web/app/src/Features/Captcha/CaptchaMiddleware.js b/services/web/app/src/Features/Captcha/CaptchaMiddleware.js
index d1b9fd6bd7..2bf2877345 100644
--- a/services/web/app/src/Features/Captcha/CaptchaMiddleware.js
+++ b/services/web/app/src/Features/Captcha/CaptchaMiddleware.js
@@ -12,7 +12,7 @@
  */
 let CaptchaMiddleware
 const request = require('request')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const Settings = require('@overleaf/settings')
 
 module.exports = CaptchaMiddleware = {
diff --git a/services/web/app/src/Features/Collaborators/CollaboratorsController.js b/services/web/app/src/Features/Collaborators/CollaboratorsController.js
index 2155a7723c..31159162a6 100644
--- a/services/web/app/src/Features/Collaborators/CollaboratorsController.js
+++ b/services/web/app/src/Features/Collaborators/CollaboratorsController.js
@@ -8,7 +8,7 @@ const SessionManager = require('../Authentication/SessionManager')
 const EditorRealTimeController = require('../Editor/EditorRealTimeController')
 const TagsHandler = require('../Tags/TagsHandler')
 const Errors = require('../Errors/Errors')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const { expressify } = require('../../util/promises')
 
 module.exports = {
diff --git a/services/web/app/src/Features/Collaborators/CollaboratorsHandler.js b/services/web/app/src/Features/Collaborators/CollaboratorsHandler.js
index 9dd3f1c9d9..b8f1fa56a8 100644
--- a/services/web/app/src/Features/Collaborators/CollaboratorsHandler.js
+++ b/services/web/app/src/Features/Collaborators/CollaboratorsHandler.js
@@ -3,7 +3,7 @@ const OError = require('@overleaf/o-error')
 const { Project } = require('../../models/Project')
 const ProjectGetter = require('../Project/ProjectGetter')
 const ProjectHelper = require('../Project/ProjectHelper')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const ContactManager = require('../Contacts/ContactManager')
 const PrivilegeLevels = require('../Authorization/PrivilegeLevels')
 const TpdsProjectFlusher = require('../ThirdPartyDataStore/TpdsProjectFlusher')
diff --git a/services/web/app/src/Features/Collaborators/CollaboratorsInviteController.js b/services/web/app/src/Features/Collaborators/CollaboratorsInviteController.js
index e29bae96f5..89d3447853 100644
--- a/services/web/app/src/Features/Collaborators/CollaboratorsInviteController.js
+++ b/services/web/app/src/Features/Collaborators/CollaboratorsInviteController.js
@@ -19,7 +19,7 @@ const LimitationsManager = require('../Subscription/LimitationsManager')
 const UserGetter = require('../User/UserGetter')
 const CollaboratorsGetter = require('./CollaboratorsGetter')
 const CollaboratorsInviteHandler = require('./CollaboratorsInviteHandler')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const Settings = require('@overleaf/settings')
 const EmailHelper = require('../Helpers/EmailHelper')
 const EditorRealTimeController = require('../Editor/EditorRealTimeController')
diff --git a/services/web/app/src/Features/Collaborators/CollaboratorsInviteHandler.js b/services/web/app/src/Features/Collaborators/CollaboratorsInviteHandler.js
index 8ef7b71702..80c1767873 100644
--- a/services/web/app/src/Features/Collaborators/CollaboratorsInviteHandler.js
+++ b/services/web/app/src/Features/Collaborators/CollaboratorsInviteHandler.js
@@ -13,7 +13,7 @@
  */
 const { ProjectInvite } = require('../../models/ProjectInvite')
 const OError = require('@overleaf/o-error')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const CollaboratorsEmailHandler = require('./CollaboratorsEmailHandler')
 const CollaboratorsHandler = require('./CollaboratorsHandler')
 const UserGetter = require('../User/UserGetter')
diff --git a/services/web/app/src/Features/Collaborators/OwnershipTransferHandler.js b/services/web/app/src/Features/Collaborators/OwnershipTransferHandler.js
index 4d86113ebe..bf31664b70 100644
--- a/services/web/app/src/Features/Collaborators/OwnershipTransferHandler.js
+++ b/services/web/app/src/Features/Collaborators/OwnershipTransferHandler.js
@@ -1,4 +1,4 @@
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const { Project } = require('../../models/Project')
 const ProjectGetter = require('../Project/ProjectGetter')
 const UserGetter = require('../User/UserGetter')
diff --git a/services/web/app/src/Features/Compile/ClsiCookieManager.js b/services/web/app/src/Features/Compile/ClsiCookieManager.js
index b70f6435e3..23f0c04646 100644
--- a/services/web/app/src/Features/Compile/ClsiCookieManager.js
+++ b/services/web/app/src/Features/Compile/ClsiCookieManager.js
@@ -21,7 +21,7 @@ if (Settings.redis.clsi_cookie_secondary != null) {
   rclient_secondary = RedisWrapper.client('clsi_cookie_secondary')
 }
 const Cookie = require('cookie')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const Metrics = require('@overleaf/metrics')
 
 const clsiCookiesEnabled =
diff --git a/services/web/app/src/Features/Compile/ClsiManager.js b/services/web/app/src/Features/Compile/ClsiManager.js
index 8f3252f648..62aa8d7897 100644
--- a/services/web/app/src/Features/Compile/ClsiManager.js
+++ b/services/web/app/src/Features/Compile/ClsiManager.js
@@ -3,7 +3,7 @@ const Settings = require('@overleaf/settings')
 const request = require('request')
 const ProjectGetter = require('../Project/ProjectGetter')
 const ProjectEntityHandler = require('../Project/ProjectEntityHandler')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const { URL } = require('url')
 const OError = require('@overleaf/o-error')
 
diff --git a/services/web/app/src/Features/Compile/ClsiStateManager.js b/services/web/app/src/Features/Compile/ClsiStateManager.js
index 6e988ddfc2..02a2fd88e4 100644
--- a/services/web/app/src/Features/Compile/ClsiStateManager.js
+++ b/services/web/app/src/Features/Compile/ClsiStateManager.js
@@ -15,7 +15,7 @@
  */
 let ClsiStateManager
 const Settings = require('@overleaf/settings')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const crypto = require('crypto')
 const ProjectEntityHandler = require('../Project/ProjectEntityHandler')
 
diff --git a/services/web/app/src/Features/Compile/CompileController.js b/services/web/app/src/Features/Compile/CompileController.js
index dc2d3d48de..4314362a1a 100644
--- a/services/web/app/src/Features/Compile/CompileController.js
+++ b/services/web/app/src/Features/Compile/CompileController.js
@@ -18,7 +18,7 @@ const Metrics = require('@overleaf/metrics')
 const ProjectGetter = require('../Project/ProjectGetter')
 const CompileManager = require('./CompileManager')
 const ClsiManager = require('./ClsiManager')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const request = require('request')
 const Settings = require('@overleaf/settings')
 const SessionManager = require('../Authentication/SessionManager')
diff --git a/services/web/app/src/Features/Contacts/ContactController.js b/services/web/app/src/Features/Contacts/ContactController.js
index 861f7329bb..292578cdae 100644
--- a/services/web/app/src/Features/Contacts/ContactController.js
+++ b/services/web/app/src/Features/Contacts/ContactController.js
@@ -16,7 +16,7 @@ let ContactsController
 const SessionManager = require('../Authentication/SessionManager')
 const ContactManager = require('./ContactManager')
 const UserGetter = require('../User/UserGetter')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const Modules = require('../../infrastructure/Modules')
 
 module.exports = ContactsController = {
diff --git a/services/web/app/src/Features/Cooldown/CooldownManager.js b/services/web/app/src/Features/Cooldown/CooldownManager.js
index 70cb3b4b1a..4ae7da6182 100644
--- a/services/web/app/src/Features/Cooldown/CooldownManager.js
+++ b/services/web/app/src/Features/Cooldown/CooldownManager.js
@@ -13,7 +13,7 @@
 let CooldownManager
 const RedisWrapper = require('../../infrastructure/RedisWrapper')
 const rclient = RedisWrapper.client('cooldown')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 
 const COOLDOWN_IN_SECONDS = 60 * 10
 
diff --git a/services/web/app/src/Features/Cooldown/CooldownMiddleware.js b/services/web/app/src/Features/Cooldown/CooldownMiddleware.js
index 8d1b456cb4..0f5f98fb2d 100644
--- a/services/web/app/src/Features/Cooldown/CooldownMiddleware.js
+++ b/services/web/app/src/Features/Cooldown/CooldownMiddleware.js
@@ -12,7 +12,7 @@
  */
 let CooldownMiddleware
 const CooldownManager = require('./CooldownManager')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 
 module.exports = CooldownMiddleware = {
   freezeProject(req, res, next) {
diff --git a/services/web/app/src/Features/Docstore/DocstoreManager.js b/services/web/app/src/Features/Docstore/DocstoreManager.js
index 05f22783cb..87995f342e 100644
--- a/services/web/app/src/Features/Docstore/DocstoreManager.js
+++ b/services/web/app/src/Features/Docstore/DocstoreManager.js
@@ -2,7 +2,7 @@ const { promisify } = require('util')
 const { promisifyMultiResult } = require('../../util/promises')
 const request = require('request').defaults({ jar: false })
 const OError = require('@overleaf/o-error')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const settings = require('@overleaf/settings')
 const Errors = require('../Errors/Errors')
 
diff --git a/services/web/app/src/Features/DocumentUpdater/DocumentUpdaterHandler.js b/services/web/app/src/Features/DocumentUpdater/DocumentUpdaterHandler.js
index b4777d140c..358ee1e2b0 100644
--- a/services/web/app/src/Features/DocumentUpdater/DocumentUpdaterHandler.js
+++ b/services/web/app/src/Features/DocumentUpdater/DocumentUpdaterHandler.js
@@ -3,7 +3,7 @@ const OError = require('@overleaf/o-error')
 const settings = require('@overleaf/settings')
 const _ = require('underscore')
 const async = require('async')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const metrics = require('@overleaf/metrics')
 const { promisify } = require('util')
 
diff --git a/services/web/app/src/Features/Documents/DocumentController.js b/services/web/app/src/Features/Documents/DocumentController.js
index aa00235c49..0d0e7e23af 100644
--- a/services/web/app/src/Features/Documents/DocumentController.js
+++ b/services/web/app/src/Features/Documents/DocumentController.js
@@ -3,7 +3,7 @@ const OError = require('@overleaf/o-error')
 const ProjectLocator = require('../Project/ProjectLocator')
 const ProjectEntityHandler = require('../Project/ProjectEntityHandler')
 const ProjectEntityUpdateHandler = require('../Project/ProjectEntityUpdateHandler')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const _ = require('lodash')
 
 function getDocument(req, res, next) {
diff --git a/services/web/app/src/Features/Downloads/ProjectDownloadsController.js b/services/web/app/src/Features/Downloads/ProjectDownloadsController.js
index 74a7f5b437..0e16eb6c57 100644
--- a/services/web/app/src/Features/Downloads/ProjectDownloadsController.js
+++ b/services/web/app/src/Features/Downloads/ProjectDownloadsController.js
@@ -12,7 +12,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 let ProjectDownloadsController
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const Metrics = require('@overleaf/metrics')
 const ProjectGetter = require('../Project/ProjectGetter')
 const ProjectZipStreamManager = require('./ProjectZipStreamManager')
diff --git a/services/web/app/src/Features/Downloads/ProjectZipStreamManager.js b/services/web/app/src/Features/Downloads/ProjectZipStreamManager.js
index 38112691c5..8c66cb892e 100644
--- a/services/web/app/src/Features/Downloads/ProjectZipStreamManager.js
+++ b/services/web/app/src/Features/Downloads/ProjectZipStreamManager.js
@@ -1,7 +1,7 @@
 let ProjectZipStreamManager
 const archiver = require('archiver')
 const async = require('async')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const ProjectEntityHandler = require('../Project/ProjectEntityHandler')
 const ProjectGetter = require('../Project/ProjectGetter')
 const FileStoreHandler = require('../FileStore/FileStoreHandler')
diff --git a/services/web/app/src/Features/Editor/EditorController.js b/services/web/app/src/Features/Editor/EditorController.js
index 6fc8959bdd..1788ae2902 100644
--- a/services/web/app/src/Features/Editor/EditorController.js
+++ b/services/web/app/src/Features/Editor/EditorController.js
@@ -13,7 +13,7 @@
  * DS207: Consider shorter variations of null checks
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const OError = require('@overleaf/o-error')
 const Metrics = require('@overleaf/metrics')
 const ProjectEntityUpdateHandler = require('../Project/ProjectEntityUpdateHandler')
diff --git a/services/web/app/src/Features/Editor/EditorHttpController.js b/services/web/app/src/Features/Editor/EditorHttpController.js
index 555b7b2233..549a69bcac 100644
--- a/services/web/app/src/Features/Editor/EditorHttpController.js
+++ b/services/web/app/src/Features/Editor/EditorHttpController.js
@@ -14,7 +14,7 @@ const Errors = require('../Errors/Errors')
 const HttpErrorHandler = require('../Errors/HttpErrorHandler')
 const ProjectEntityUpdateHandler = require('../Project/ProjectEntityUpdateHandler')
 const DocstoreManager = require('../Docstore/DocstoreManager')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const { expressify } = require('../../util/promises')
 
 module.exports = {
diff --git a/services/web/app/src/Features/Email/EmailSender.js b/services/web/app/src/Features/Email/EmailSender.js
index 9a9aa5380b..d3b9ebb873 100644
--- a/services/web/app/src/Features/Email/EmailSender.js
+++ b/services/web/app/src/Features/Email/EmailSender.js
@@ -1,5 +1,5 @@
 const { callbackify } = require('util')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const metrics = require('@overleaf/metrics')
 const Settings = require('@overleaf/settings')
 const nodemailer = require('nodemailer')
diff --git a/services/web/app/src/Features/Errors/ErrorController.js b/services/web/app/src/Features/Errors/ErrorController.js
index 338b526035..d223abbf3c 100644
--- a/services/web/app/src/Features/Errors/ErrorController.js
+++ b/services/web/app/src/Features/Errors/ErrorController.js
@@ -1,6 +1,6 @@
 let ErrorController
 const Errors = require('./Errors')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const SessionManager = require('../Authentication/SessionManager')
 const SamlLogHandler = require('../SamlLog/SamlLogHandler')
 const HttpErrorHandler = require('./HttpErrorHandler')
diff --git a/services/web/app/src/Features/Errors/HttpErrorHandler.js b/services/web/app/src/Features/Errors/HttpErrorHandler.js
index b706583111..cdbd8caec6 100644
--- a/services/web/app/src/Features/Errors/HttpErrorHandler.js
+++ b/services/web/app/src/Features/Errors/HttpErrorHandler.js
@@ -1,4 +1,4 @@
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const Settings = require('@overleaf/settings')
 
 function renderJSONError(res, message, info = {}) {
diff --git a/services/web/app/src/Features/Exports/ExportsController.js b/services/web/app/src/Features/Exports/ExportsController.js
index 01e1a358c0..7d31f479aa 100644
--- a/services/web/app/src/Features/Exports/ExportsController.js
+++ b/services/web/app/src/Features/Exports/ExportsController.js
@@ -12,7 +12,7 @@
  */
 const ExportsHandler = require('./ExportsHandler')
 const SessionManager = require('../Authentication/SessionManager')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 
 module.exports = {
   exportProject(req, res, next) {
diff --git a/services/web/app/src/Features/Exports/ExportsHandler.js b/services/web/app/src/Features/Exports/ExportsHandler.js
index d456b7473c..21cc94b27c 100644
--- a/services/web/app/src/Features/Exports/ExportsHandler.js
+++ b/services/web/app/src/Features/Exports/ExportsHandler.js
@@ -20,7 +20,7 @@ const ProjectHistoryHandler = require('../Project/ProjectHistoryHandler')
 const ProjectLocator = require('../Project/ProjectLocator')
 const ProjectRootDocManager = require('../Project/ProjectRootDocManager')
 const UserGetter = require('../User/UserGetter')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 let settings = require('@overleaf/settings')
 const async = require('async')
 let request = require('request')
diff --git a/services/web/app/src/Features/FileStore/FileHashManager.js b/services/web/app/src/Features/FileStore/FileHashManager.js
index 8d6f75e810..bde054fa06 100644
--- a/services/web/app/src/Features/FileStore/FileHashManager.js
+++ b/services/web/app/src/Features/FileStore/FileHashManager.js
@@ -13,7 +13,7 @@
  */
 let FileHashManager
 const crypto = require('crypto')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const fs = require('fs')
 const _ = require('underscore')
 
diff --git a/services/web/app/src/Features/FileStore/FileStoreController.js b/services/web/app/src/Features/FileStore/FileStoreController.js
index 7db347fae0..9ebae11893 100644
--- a/services/web/app/src/Features/FileStore/FileStoreController.js
+++ b/services/web/app/src/Features/FileStore/FileStoreController.js
@@ -1,4 +1,4 @@
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 
 const FileStoreHandler = require('./FileStoreHandler')
 const ProjectLocator = require('../Project/ProjectLocator')
diff --git a/services/web/app/src/Features/FileStore/FileStoreHandler.js b/services/web/app/src/Features/FileStore/FileStoreHandler.js
index 85aac4d748..bb8e57d598 100644
--- a/services/web/app/src/Features/FileStore/FileStoreHandler.js
+++ b/services/web/app/src/Features/FileStore/FileStoreHandler.js
@@ -1,5 +1,5 @@
 const _ = require('underscore')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const fs = require('fs')
 const request = require('request')
 const settings = require('@overleaf/settings')
diff --git a/services/web/app/src/Features/HealthCheck/HealthCheckController.js b/services/web/app/src/Features/HealthCheck/HealthCheckController.js
index 4f8a2eddcd..3e7b84d0e7 100644
--- a/services/web/app/src/Features/HealthCheck/HealthCheckController.js
+++ b/services/web/app/src/Features/HealthCheck/HealthCheckController.js
@@ -1,7 +1,7 @@
 const RedisWrapper = require('../../infrastructure/RedisWrapper')
 const rclient = RedisWrapper.client('health_check')
 const settings = require('@overleaf/settings')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const UserGetter = require('../User/UserGetter')
 const {
   SmokeTestFailure,
diff --git a/services/web/app/src/Features/History/HistoryController.js b/services/web/app/src/Features/History/HistoryController.js
index 7482d676e8..1319f6b088 100644
--- a/services/web/app/src/Features/History/HistoryController.js
+++ b/services/web/app/src/Features/History/HistoryController.js
@@ -1,7 +1,7 @@
 let HistoryController
 const OError = require('@overleaf/o-error')
 const async = require('async')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const request = require('request')
 const settings = require('@overleaf/settings')
 const SessionManager = require('../Authentication/SessionManager')
diff --git a/services/web/app/src/Features/InactiveData/InactiveProjectManager.js b/services/web/app/src/Features/InactiveData/InactiveProjectManager.js
index 0495370260..2c8acc23ac 100644
--- a/services/web/app/src/Features/InactiveData/InactiveProjectManager.js
+++ b/services/web/app/src/Features/InactiveData/InactiveProjectManager.js
@@ -14,7 +14,7 @@ let InactiveProjectManager
 const OError = require('@overleaf/o-error')
 const async = require('async')
 const _ = require('underscore')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const DocstoreManager = require('../Docstore/DocstoreManager')
 const ProjectGetter = require('../Project/ProjectGetter')
 const ProjectUpdateHandler = require('../Project/ProjectUpdateHandler')
diff --git a/services/web/app/src/Features/Institutions/InstitutionsAPI.js b/services/web/app/src/Features/Institutions/InstitutionsAPI.js
index 98368fb96b..0f27ad8b50 100644
--- a/services/web/app/src/Features/Institutions/InstitutionsAPI.js
+++ b/services/web/app/src/Features/Institutions/InstitutionsAPI.js
@@ -1,5 +1,5 @@
 const OError = require('@overleaf/o-error')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const metrics = require('@overleaf/metrics')
 const settings = require('@overleaf/settings')
 const request = require('requestretry')
diff --git a/services/web/app/src/Features/LinkedFiles/LinkedFilesController.js b/services/web/app/src/Features/LinkedFiles/LinkedFilesController.js
index 991c5b23b6..b6f06ee1e9 100644
--- a/services/web/app/src/Features/LinkedFiles/LinkedFilesController.js
+++ b/services/web/app/src/Features/LinkedFiles/LinkedFilesController.js
@@ -17,7 +17,7 @@ const SessionManager = require('../Authentication/SessionManager')
 const EditorController = require('../Editor/EditorController')
 const ProjectLocator = require('../Project/ProjectLocator')
 const Settings = require('@overleaf/settings')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const _ = require('underscore')
 const LinkedFilesHandler = require('./LinkedFilesHandler')
 const {
diff --git a/services/web/app/src/Features/Metadata/MetaController.js b/services/web/app/src/Features/Metadata/MetaController.js
index 44173b461c..070219c5b1 100644
--- a/services/web/app/src/Features/Metadata/MetaController.js
+++ b/services/web/app/src/Features/Metadata/MetaController.js
@@ -15,7 +15,7 @@ let MetaController
 const OError = require('@overleaf/o-error')
 const EditorRealTimeController = require('../Editor/EditorRealTimeController')
 const MetaHandler = require('./MetaHandler')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 
 module.exports = MetaController = {
   getMetadata(req, res, next) {
diff --git a/services/web/app/src/Features/Newsletter/NewsletterManager.js b/services/web/app/src/Features/Newsletter/NewsletterManager.js
index 80d5cd24a6..e05a02bb86 100644
--- a/services/web/app/src/Features/Newsletter/NewsletterManager.js
+++ b/services/web/app/src/Features/Newsletter/NewsletterManager.js
@@ -1,5 +1,5 @@
 const { callbackify } = require('util')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const Settings = require('@overleaf/settings')
 const crypto = require('crypto')
 const Mailchimp = require('mailchimp-api-v3')
diff --git a/services/web/app/src/Features/Notifications/NotificationsHandler.js b/services/web/app/src/Features/Notifications/NotificationsHandler.js
index f6415f43b8..45282b7269 100644
--- a/services/web/app/src/Features/Notifications/NotificationsHandler.js
+++ b/services/web/app/src/Features/Notifications/NotificationsHandler.js
@@ -1,6 +1,6 @@
 const settings = require('@overleaf/settings')
 const request = require('request')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const _ = require('lodash')
 
 const notificationsApi = _.get(settings, ['apis', 'notifications', 'url'])
diff --git a/services/web/app/src/Features/Project/ProjectApiController.js b/services/web/app/src/Features/Project/ProjectApiController.js
index 8bab741df1..e06a43346a 100644
--- a/services/web/app/src/Features/Project/ProjectApiController.js
+++ b/services/web/app/src/Features/Project/ProjectApiController.js
@@ -12,7 +12,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 const ProjectDetailsHandler = require('./ProjectDetailsHandler')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 
 module.exports = {
   getProjectDetails(req, res, next) {
diff --git a/services/web/app/src/Features/Project/ProjectController.js b/services/web/app/src/Features/Project/ProjectController.js
index 76738e8b72..9f22af22ca 100644
--- a/services/web/app/src/Features/Project/ProjectController.js
+++ b/services/web/app/src/Features/Project/ProjectController.js
@@ -4,7 +4,7 @@ const OError = require('@overleaf/o-error')
 const fs = require('fs')
 const crypto = require('crypto')
 const async = require('async')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const { ObjectId } = require('mongodb')
 const ProjectDeleter = require('./ProjectDeleter')
 const ProjectDuplicator = require('./ProjectDuplicator')
diff --git a/services/web/app/src/Features/Project/ProjectCreationHandler.js b/services/web/app/src/Features/Project/ProjectCreationHandler.js
index 401f40f4a9..f5eeffccb2 100644
--- a/services/web/app/src/Features/Project/ProjectCreationHandler.js
+++ b/services/web/app/src/Features/Project/ProjectCreationHandler.js
@@ -1,4 +1,4 @@
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const OError = require('@overleaf/o-error')
 const metrics = require('@overleaf/metrics')
 const Settings = require('@overleaf/settings')
diff --git a/services/web/app/src/Features/Project/ProjectDeleter.js b/services/web/app/src/Features/Project/ProjectDeleter.js
index e1f2c6406b..0800fa6ab9 100644
--- a/services/web/app/src/Features/Project/ProjectDeleter.js
+++ b/services/web/app/src/Features/Project/ProjectDeleter.js
@@ -5,7 +5,7 @@ const { callbackify } = require('util')
 const { Project } = require('../../models/Project')
 const { DeletedProject } = require('../../models/DeletedProject')
 const Errors = require('../Errors/Errors')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const DocumentUpdaterHandler = require('../DocumentUpdater/DocumentUpdaterHandler')
 const TagsHandler = require('../Tags/TagsHandler')
 const ProjectHelper = require('./ProjectHelper')
diff --git a/services/web/app/src/Features/Project/ProjectDetailsHandler.js b/services/web/app/src/Features/Project/ProjectDetailsHandler.js
index 90ef7548c1..a52be57439 100644
--- a/services/web/app/src/Features/Project/ProjectDetailsHandler.js
+++ b/services/web/app/src/Features/Project/ProjectDetailsHandler.js
@@ -2,7 +2,7 @@ const _ = require('underscore')
 const ProjectGetter = require('./ProjectGetter')
 const UserGetter = require('../User/UserGetter')
 const { Project } = require('../../models/Project')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const TpdsUpdateSender = require('../ThirdPartyDataStore/TpdsUpdateSender')
 const PublicAccessLevels = require('../Authorization/PublicAccessLevels')
 const Errors = require('../Errors/Errors')
diff --git a/services/web/app/src/Features/Project/ProjectEntityMongoUpdateHandler.js b/services/web/app/src/Features/Project/ProjectEntityMongoUpdateHandler.js
index c144a57903..461cd726e3 100644
--- a/services/web/app/src/Features/Project/ProjectEntityMongoUpdateHandler.js
+++ b/services/web/app/src/Features/Project/ProjectEntityMongoUpdateHandler.js
@@ -1,7 +1,7 @@
 const { callbackify } = require('util')
 const { callbackifyMultiResult } = require('../../util/promises')
 const _ = require('underscore')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const path = require('path')
 const { ObjectId } = require('mongodb')
 const Settings = require('@overleaf/settings')
diff --git a/services/web/app/src/Features/Project/ProjectEntityUpdateHandler.js b/services/web/app/src/Features/Project/ProjectEntityUpdateHandler.js
index 369f2ca492..5a172ffbd8 100644
--- a/services/web/app/src/Features/Project/ProjectEntityUpdateHandler.js
+++ b/services/web/app/src/Features/Project/ProjectEntityUpdateHandler.js
@@ -1,7 +1,7 @@
 const _ = require('lodash')
 const OError = require('@overleaf/o-error')
 const async = require('async')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const Settings = require('@overleaf/settings')
 const Path = require('path')
 const fs = require('fs')
diff --git a/services/web/app/src/Features/Project/ProjectGetter.js b/services/web/app/src/Features/Project/ProjectGetter.js
index 5b72433b76..25997e3ac0 100644
--- a/services/web/app/src/Features/Project/ProjectGetter.js
+++ b/services/web/app/src/Features/Project/ProjectGetter.js
@@ -4,7 +4,7 @@ const OError = require('@overleaf/o-error')
 const metrics = require('@overleaf/metrics')
 const { promisifyAll } = require('../../util/promises')
 const { Project } = require('../../models/Project')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const LockManager = require('../../infrastructure/LockManager')
 const { DeletedProject } = require('../../models/DeletedProject')
 
diff --git a/services/web/app/src/Features/Project/ProjectHistoryHandler.js b/services/web/app/src/Features/Project/ProjectHistoryHandler.js
index 420f68b9f2..8c6c69a656 100644
--- a/services/web/app/src/Features/Project/ProjectHistoryHandler.js
+++ b/services/web/app/src/Features/Project/ProjectHistoryHandler.js
@@ -15,7 +15,7 @@
  */
 const { Project } = require('../../models/Project')
 const ProjectDetailsHandler = require('./ProjectDetailsHandler')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const settings = require('@overleaf/settings')
 const HistoryManager = require('../History/HistoryManager')
 const ProjectEntityUpdateHandler = require('./ProjectEntityUpdateHandler')
diff --git a/services/web/app/src/Features/Project/ProjectLocator.js b/services/web/app/src/Features/Project/ProjectLocator.js
index 7d672fab75..e62b4dccae 100644
--- a/services/web/app/src/Features/Project/ProjectLocator.js
+++ b/services/web/app/src/Features/Project/ProjectLocator.js
@@ -1,5 +1,5 @@
 const _ = require('underscore')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const async = require('async')
 const ProjectGetter = require('./ProjectGetter')
 const Errors = require('../Errors/Errors')
diff --git a/services/web/app/src/Features/Project/ProjectUpdateHandler.js b/services/web/app/src/Features/Project/ProjectUpdateHandler.js
index 789ffbcce5..4716ac40dd 100644
--- a/services/web/app/src/Features/Project/ProjectUpdateHandler.js
+++ b/services/web/app/src/Features/Project/ProjectUpdateHandler.js
@@ -12,7 +12,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 const { Project } = require('../../models/Project')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 
 module.exports = {
   markAsUpdated(projectId, lastUpdatedAt, lastUpdatedBy, callback) {
diff --git a/services/web/app/src/Features/Publishers/PublishersGetter.js b/services/web/app/src/Features/Publishers/PublishersGetter.js
index 0e44e4f4f7..03b038fd6b 100644
--- a/services/web/app/src/Features/Publishers/PublishersGetter.js
+++ b/services/web/app/src/Features/Publishers/PublishersGetter.js
@@ -15,7 +15,7 @@
 let PublishersGetter
 const UserMembershipsHandler = require('../UserMembership/UserMembershipsHandler')
 const UserMembershipEntityConfigs = require('../UserMembership/UserMembershipEntityConfigs')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const _ = require('underscore')
 
 module.exports = PublishersGetter = {
diff --git a/services/web/app/src/Features/References/ReferencesController.js b/services/web/app/src/Features/References/ReferencesController.js
index 0ea054f2a5..160da5f065 100644
--- a/services/web/app/src/Features/References/ReferencesController.js
+++ b/services/web/app/src/Features/References/ReferencesController.js
@@ -11,7 +11,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 let ReferencesController
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const ReferencesHandler = require('./ReferencesHandler')
 const settings = require('@overleaf/settings')
 const EditorRealTimeController = require('../Editor/EditorRealTimeController')
diff --git a/services/web/app/src/Features/References/ReferencesHandler.js b/services/web/app/src/Features/References/ReferencesHandler.js
index 8f634317a2..df90d0c979 100644
--- a/services/web/app/src/Features/References/ReferencesHandler.js
+++ b/services/web/app/src/Features/References/ReferencesHandler.js
@@ -14,7 +14,7 @@
  */
 let ReferencesHandler
 const OError = require('@overleaf/o-error')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const request = require('request')
 const settings = require('@overleaf/settings')
 const Features = require('../../infrastructure/Features')
diff --git a/services/web/app/src/Features/SamlLog/SamlLogHandler.js b/services/web/app/src/Features/SamlLog/SamlLogHandler.js
index 8b69f324c0..354eaa6ac7 100644
--- a/services/web/app/src/Features/SamlLog/SamlLogHandler.js
+++ b/services/web/app/src/Features/SamlLog/SamlLogHandler.js
@@ -1,5 +1,5 @@
 const { SamlLog } = require('../../models/SamlLog')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 
 function log(providerId, sessionId, data) {
   try {
diff --git a/services/web/app/src/Features/Security/RateLimiterMiddleware.js b/services/web/app/src/Features/Security/RateLimiterMiddleware.js
index 41a0f804b5..bf6f175c45 100644
--- a/services/web/app/src/Features/Security/RateLimiterMiddleware.js
+++ b/services/web/app/src/Features/Security/RateLimiterMiddleware.js
@@ -1,5 +1,5 @@
 const RateLimiter = require('../../infrastructure/RateLimiter')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const SessionManager = require('../Authentication/SessionManager')
 const LoginRateLimiter = require('./LoginRateLimiter')
 const settings = require('@overleaf/settings')
diff --git a/services/web/app/src/Features/ServerAdmin/AdminController.js b/services/web/app/src/Features/ServerAdmin/AdminController.js
index 6f8e8b50bb..9b5fa3a6eb 100644
--- a/services/web/app/src/Features/ServerAdmin/AdminController.js
+++ b/services/web/app/src/Features/ServerAdmin/AdminController.js
@@ -16,7 +16,7 @@
  */
 
 const metrics = require('@overleaf/metrics')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const _ = require('underscore')
 const DocumentUpdaterHandler = require('../DocumentUpdater/DocumentUpdaterHandler')
 const Settings = require('@overleaf/settings')
diff --git a/services/web/app/src/Features/Spelling/SpellingController.js b/services/web/app/src/Features/Spelling/SpellingController.js
index 0363770ff0..baf0a29d83 100644
--- a/services/web/app/src/Features/Spelling/SpellingController.js
+++ b/services/web/app/src/Features/Spelling/SpellingController.js
@@ -1,6 +1,6 @@
 const request = require('request')
 const Settings = require('@overleaf/settings')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const SessionManager = require('../Authentication/SessionManager')
 
 const TEN_SECONDS = 1000 * 10
diff --git a/services/web/app/src/Features/StaticPages/UniversityController.js b/services/web/app/src/Features/StaticPages/UniversityController.js
index 7d8f07cd56..3304589d99 100644
--- a/services/web/app/src/Features/StaticPages/UniversityController.js
+++ b/services/web/app/src/Features/StaticPages/UniversityController.js
@@ -11,7 +11,7 @@
  */
 let UniversityController
 const settings = require('@overleaf/settings')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const Settings = require('@overleaf/settings')
 
 module.exports = UniversityController = {
diff --git a/services/web/app/src/Features/Subscription/FeaturesUpdater.js b/services/web/app/src/Features/Subscription/FeaturesUpdater.js
index b1872a6294..323a041ca2 100644
--- a/services/web/app/src/Features/Subscription/FeaturesUpdater.js
+++ b/services/web/app/src/Features/Subscription/FeaturesUpdater.js
@@ -6,7 +6,7 @@ const SubscriptionLocator = require('./SubscriptionLocator')
 const UserFeaturesUpdater = require('./UserFeaturesUpdater')
 const FeaturesHelper = require('./FeaturesHelper')
 const Settings = require('@overleaf/settings')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const ReferalFeatures = require('../Referal/ReferalFeatures')
 const V1SubscriptionManager = require('./V1SubscriptionManager')
 const InstitutionsFeatures = require('../Institutions/InstitutionsFeatures')
diff --git a/services/web/app/src/Features/Subscription/LimitationsManager.js b/services/web/app/src/Features/Subscription/LimitationsManager.js
index 5405f9a6ad..1d4ee7959c 100644
--- a/services/web/app/src/Features/Subscription/LimitationsManager.js
+++ b/services/web/app/src/Features/Subscription/LimitationsManager.js
@@ -1,5 +1,5 @@
 const OError = require('@overleaf/o-error')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const ProjectGetter = require('../Project/ProjectGetter')
 const UserGetter = require('../User/UserGetter')
 const SubscriptionLocator = require('./SubscriptionLocator')
diff --git a/services/web/app/src/Features/Subscription/PlansLocator.js b/services/web/app/src/Features/Subscription/PlansLocator.js
index 4c40031c2b..27972b0eef 100644
--- a/services/web/app/src/Features/Subscription/PlansLocator.js
+++ b/services/web/app/src/Features/Subscription/PlansLocator.js
@@ -1,5 +1,5 @@
 const Settings = require('@overleaf/settings')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 
 function ensurePlansAreSetupCorrectly() {
   Settings.plans.forEach(plan => {
diff --git a/services/web/app/src/Features/Subscription/RecurlyClient.js b/services/web/app/src/Features/Subscription/RecurlyClient.js
index 5be35ee39d..6387536025 100644
--- a/services/web/app/src/Features/Subscription/RecurlyClient.js
+++ b/services/web/app/src/Features/Subscription/RecurlyClient.js
@@ -1,6 +1,6 @@
 const recurly = require('recurly')
 const Settings = require('@overleaf/settings')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const { callbackify } = require('util')
 const UserGetter = require('../User/UserGetter')
 
diff --git a/services/web/app/src/Features/Subscription/RecurlyWrapper.js b/services/web/app/src/Features/Subscription/RecurlyWrapper.js
index c713060566..92755e7d94 100644
--- a/services/web/app/src/Features/Subscription/RecurlyWrapper.js
+++ b/services/web/app/src/Features/Subscription/RecurlyWrapper.js
@@ -21,7 +21,7 @@ const crypto = require('crypto')
 const request = require('request')
 const Settings = require('@overleaf/settings')
 const xml2js = require('xml2js')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const Async = require('async')
 const Errors = require('../Errors/Errors')
 const SubscriptionErrors = require('./Errors')
diff --git a/services/web/app/src/Features/Subscription/SubscriptionController.js b/services/web/app/src/Features/Subscription/SubscriptionController.js
index 288b3099d7..27d32da407 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionController.js
+++ b/services/web/app/src/Features/Subscription/SubscriptionController.js
@@ -5,7 +5,7 @@ const SubscriptionViewModelBuilder = require('./SubscriptionViewModelBuilder')
 const LimitationsManager = require('./LimitationsManager')
 const RecurlyWrapper = require('./RecurlyWrapper')
 const Settings = require('@overleaf/settings')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const GeoIpLookup = require('../../infrastructure/GeoIpLookup')
 const FeaturesUpdater = require('./FeaturesUpdater')
 const planFeatures = require('./planFeatures')
diff --git a/services/web/app/src/Features/Subscription/SubscriptionGroupController.js b/services/web/app/src/Features/Subscription/SubscriptionGroupController.js
index 5d4a43adfe..2985acbfbd 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionGroupController.js
+++ b/services/web/app/src/Features/Subscription/SubscriptionGroupController.js
@@ -13,7 +13,7 @@
  */
 const SubscriptionGroupHandler = require('./SubscriptionGroupHandler')
 const OError = require('@overleaf/o-error')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const SubscriptionLocator = require('./SubscriptionLocator')
 const SessionManager = require('../Authentication/SessionManager')
 const _ = require('underscore')
diff --git a/services/web/app/src/Features/Subscription/SubscriptionGroupHandler.js b/services/web/app/src/Features/Subscription/SubscriptionGroupHandler.js
index 44a0196552..0b60c7ebd4 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionGroupHandler.js
+++ b/services/web/app/src/Features/Subscription/SubscriptionGroupHandler.js
@@ -21,7 +21,7 @@ const SubscriptionLocator = require('./SubscriptionLocator')
 const UserGetter = require('../User/UserGetter')
 const { Subscription } = require('../../models/Subscription')
 const LimitationsManager = require('./LimitationsManager')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const OneTimeTokenHandler = require('../Security/OneTimeTokenHandler')
 const EmailHandler = require('../Email/EmailHandler')
 const settings = require('@overleaf/settings')
diff --git a/services/web/app/src/Features/Subscription/SubscriptionHandler.js b/services/web/app/src/Features/Subscription/SubscriptionHandler.js
index 3146d770dc..b9d9372f8b 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionHandler.js
+++ b/services/web/app/src/Features/Subscription/SubscriptionHandler.js
@@ -3,7 +3,7 @@ const { promisify } = require('util')
 const RecurlyWrapper = require('./RecurlyWrapper')
 const RecurlyClient = require('./RecurlyClient')
 const { User } = require('../../models/User')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const SubscriptionUpdater = require('./SubscriptionUpdater')
 const LimitationsManager = require('./LimitationsManager')
 const EmailHandler = require('../Email/EmailHandler')
diff --git a/services/web/app/src/Features/Subscription/SubscriptionLocator.js b/services/web/app/src/Features/Subscription/SubscriptionLocator.js
index e497e57a8d..b12cd392d7 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionLocator.js
+++ b/services/web/app/src/Features/Subscription/SubscriptionLocator.js
@@ -15,7 +15,7 @@
 const { promisify } = require('util')
 const { Subscription } = require('../../models/Subscription')
 const { DeletedSubscription } = require('../../models/DeletedSubscription')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 require('./GroupPlansData') // make sure dynamic group plans are loaded
 
 const SubscriptionLocator = {
diff --git a/services/web/app/src/Features/Subscription/SubscriptionUpdater.js b/services/web/app/src/Features/Subscription/SubscriptionUpdater.js
index c658012b79..d0d20fa292 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionUpdater.js
+++ b/services/web/app/src/Features/Subscription/SubscriptionUpdater.js
@@ -7,7 +7,7 @@ const FeaturesUpdater = require('./FeaturesUpdater')
 const FeaturesHelper = require('./FeaturesHelper')
 const AnalyticsManager = require('../Analytics/AnalyticsManager')
 const { DeletedSubscription } = require('../../models/DeletedSubscription')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 
 /**
  * Change the admin of the given subscription.
diff --git a/services/web/app/src/Features/Subscription/TeamInvitesController.js b/services/web/app/src/Features/Subscription/TeamInvitesController.js
index 3477f72948..bff6cd6d5c 100644
--- a/services/web/app/src/Features/Subscription/TeamInvitesController.js
+++ b/services/web/app/src/Features/Subscription/TeamInvitesController.js
@@ -11,7 +11,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 const settings = require('@overleaf/settings')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const TeamInvitesHandler = require('./TeamInvitesHandler')
 const SessionManager = require('../Authentication/SessionManager')
 const SubscriptionLocator = require('./SubscriptionLocator')
diff --git a/services/web/app/src/Features/Subscription/TeamInvitesHandler.js b/services/web/app/src/Features/Subscription/TeamInvitesHandler.js
index e4e8d12f11..b2ca4ee03f 100644
--- a/services/web/app/src/Features/Subscription/TeamInvitesHandler.js
+++ b/services/web/app/src/Features/Subscription/TeamInvitesHandler.js
@@ -1,5 +1,5 @@
 let TeamInvitesHandler
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const crypto = require('crypto')
 const async = require('async')
 
diff --git a/services/web/app/src/Features/Templates/TemplatesController.js b/services/web/app/src/Features/Templates/TemplatesController.js
index 3dd29699ca..27c7f14fc0 100644
--- a/services/web/app/src/Features/Templates/TemplatesController.js
+++ b/services/web/app/src/Features/Templates/TemplatesController.js
@@ -16,7 +16,7 @@ const path = require('path')
 const SessionManager = require('../Authentication/SessionManager')
 const TemplatesManager = require('./TemplatesManager')
 const ProjectHelper = require('../Project/ProjectHelper')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 
 module.exports = TemplatesController = {
   getV1Template(req, res) {
diff --git a/services/web/app/src/Features/Templates/TemplatesManager.js b/services/web/app/src/Features/Templates/TemplatesManager.js
index fdb13251c8..38d599f934 100644
--- a/services/web/app/src/Features/Templates/TemplatesManager.js
+++ b/services/web/app/src/Features/Templates/TemplatesManager.js
@@ -20,7 +20,7 @@ const FileWriter = require('../../infrastructure/FileWriter')
 const async = require('async')
 const fs = require('fs')
 const util = require('util')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const request = require('request')
 const requestPromise = require('request-promise-native')
 const settings = require('@overleaf/settings')
diff --git a/services/web/app/src/Features/Templates/TemplatesMiddleware.js b/services/web/app/src/Features/Templates/TemplatesMiddleware.js
index ff3bebf4c9..8315f537b2 100644
--- a/services/web/app/src/Features/Templates/TemplatesMiddleware.js
+++ b/services/web/app/src/Features/Templates/TemplatesMiddleware.js
@@ -9,7 +9,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 const settings = require('@overleaf/settings')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 
 module.exports = {
   saveTemplateDataInSession(req, res, next) {
diff --git a/services/web/app/src/Features/ThirdPartyDataStore/TpdsController.js b/services/web/app/src/Features/ThirdPartyDataStore/TpdsController.js
index 1d3bead17b..30741ee823 100644
--- a/services/web/app/src/Features/ThirdPartyDataStore/TpdsController.js
+++ b/services/web/app/src/Features/ThirdPartyDataStore/TpdsController.js
@@ -3,7 +3,7 @@ let parseParams
 const TpdsUpdateHandler = require('./TpdsUpdateHandler')
 const UpdateMerger = require('./UpdateMerger')
 const Errors = require('../Errors/Errors')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const Path = require('path')
 const metrics = require('@overleaf/metrics')
 const NotificationsBuilder = require('../Notifications/NotificationsBuilder')
diff --git a/services/web/app/src/Features/ThirdPartyDataStore/TpdsProjectFlusher.js b/services/web/app/src/Features/ThirdPartyDataStore/TpdsProjectFlusher.js
index a5407897d7..984e1eff99 100644
--- a/services/web/app/src/Features/ThirdPartyDataStore/TpdsProjectFlusher.js
+++ b/services/web/app/src/Features/ThirdPartyDataStore/TpdsProjectFlusher.js
@@ -1,5 +1,5 @@
 const { callbackify } = require('util')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const DocumentUpdaterHandler = require('../DocumentUpdater/DocumentUpdaterHandler')
 const ProjectGetter = require('../Project/ProjectGetter')
 const ProjectEntityHandler = require('../Project/ProjectEntityHandler')
diff --git a/services/web/app/src/Features/ThirdPartyDataStore/TpdsUpdateHandler.js b/services/web/app/src/Features/ThirdPartyDataStore/TpdsUpdateHandler.js
index 4d9d28038a..ab48b297a2 100644
--- a/services/web/app/src/Features/ThirdPartyDataStore/TpdsUpdateHandler.js
+++ b/services/web/app/src/Features/ThirdPartyDataStore/TpdsUpdateHandler.js
@@ -1,5 +1,5 @@
 const UpdateMerger = require('./UpdateMerger')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const NotificationsBuilder = require('../Notifications/NotificationsBuilder')
 const ProjectCreationHandler = require('../Project/ProjectCreationHandler')
 const ProjectDeleter = require('../Project/ProjectDeleter')
diff --git a/services/web/app/src/Features/ThirdPartyDataStore/TpdsUpdateSender.js b/services/web/app/src/Features/ThirdPartyDataStore/TpdsUpdateSender.js
index 69f7f7a2ea..7353e254e6 100644
--- a/services/web/app/src/Features/ThirdPartyDataStore/TpdsUpdateSender.js
+++ b/services/web/app/src/Features/ThirdPartyDataStore/TpdsUpdateSender.js
@@ -1,7 +1,7 @@
 const { ObjectId } = require('mongodb')
 const _ = require('lodash')
 const { callbackify } = require('util')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const metrics = require('@overleaf/metrics')
 const path = require('path')
 const request = require('request-promise-native')
diff --git a/services/web/app/src/Features/ThirdPartyDataStore/UpdateMerger.js b/services/web/app/src/Features/ThirdPartyDataStore/UpdateMerger.js
index b6053282f9..dbf861a1a6 100644
--- a/services/web/app/src/Features/ThirdPartyDataStore/UpdateMerger.js
+++ b/services/web/app/src/Features/ThirdPartyDataStore/UpdateMerger.js
@@ -16,7 +16,7 @@ const OError = require('@overleaf/o-error')
 const _ = require('underscore')
 const async = require('async')
 const fs = require('fs')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const EditorController = require('../Editor/EditorController')
 const FileTypeManager = require('../Uploads/FileTypeManager')
 const FileWriter = require('../../infrastructure/FileWriter')
diff --git a/services/web/app/src/Features/TokenAccess/TokenAccessController.js b/services/web/app/src/Features/TokenAccess/TokenAccessController.js
index e9b8031788..aa0cb6e894 100644
--- a/services/web/app/src/Features/TokenAccess/TokenAccessController.js
+++ b/services/web/app/src/Features/TokenAccess/TokenAccessController.js
@@ -2,7 +2,7 @@ const AuthenticationController = require('../Authentication/AuthenticationContro
 const SessionManager = require('../Authentication/SessionManager')
 const TokenAccessHandler = require('./TokenAccessHandler')
 const Errors = require('../Errors/Errors')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const settings = require('@overleaf/settings')
 const OError = require('@overleaf/o-error')
 const { expressify } = require('../../util/promises')
diff --git a/services/web/app/src/Features/TokenAccess/TokenAccessHandler.js b/services/web/app/src/Features/TokenAccess/TokenAccessHandler.js
index 1dd4004547..6f57657063 100644
--- a/services/web/app/src/Features/TokenAccess/TokenAccessHandler.js
+++ b/services/web/app/src/Features/TokenAccess/TokenAccessHandler.js
@@ -3,7 +3,7 @@ const PublicAccessLevels = require('../Authorization/PublicAccessLevels')
 const PrivilegeLevels = require('../Authorization/PrivilegeLevels')
 const { ObjectId } = require('mongodb')
 const Settings = require('@overleaf/settings')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const V1Api = require('../V1/V1Api')
 const crypto = require('crypto')
 const { promisifyAll } = require('../../util/promises')
diff --git a/services/web/app/src/Features/Uploads/ArchiveManager.js b/services/web/app/src/Features/Uploads/ArchiveManager.js
index 2a8f1aa61a..eced8d4169 100644
--- a/services/web/app/src/Features/Uploads/ArchiveManager.js
+++ b/services/web/app/src/Features/Uploads/ArchiveManager.js
@@ -12,7 +12,7 @@
  * DS207: Consider shorter variations of null checks
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const OError = require('@overleaf/o-error')
 const metrics = require('@overleaf/metrics')
 const fs = require('fs')
diff --git a/services/web/app/src/Features/Uploads/FileSystemImportManager.js b/services/web/app/src/Features/Uploads/FileSystemImportManager.js
index bf80372375..bded16e79b 100644
--- a/services/web/app/src/Features/Uploads/FileSystemImportManager.js
+++ b/services/web/app/src/Features/Uploads/FileSystemImportManager.js
@@ -5,7 +5,7 @@ const EditorController = require('../Editor/EditorController')
 const Errors = require('../Errors/Errors')
 const FileTypeManager = require('./FileTypeManager')
 const SafePath = require('../Project/SafePath')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 
 module.exports = {
   addEntity: callbackify(addEntity),
diff --git a/services/web/app/src/Features/Uploads/ProjectUploadController.js b/services/web/app/src/Features/Uploads/ProjectUploadController.js
index 74e7a99db6..69de196eb9 100644
--- a/services/web/app/src/Features/Uploads/ProjectUploadController.js
+++ b/services/web/app/src/Features/Uploads/ProjectUploadController.js
@@ -12,7 +12,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 let ProjectUploadController
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const metrics = require('@overleaf/metrics')
 const fs = require('fs')
 const Path = require('path')
diff --git a/services/web/app/src/Features/Uploads/ProjectUploadManager.js b/services/web/app/src/Features/Uploads/ProjectUploadManager.js
index 47a75799b1..530bb6352b 100644
--- a/services/web/app/src/Features/Uploads/ProjectUploadManager.js
+++ b/services/web/app/src/Features/Uploads/ProjectUploadManager.js
@@ -14,7 +14,7 @@ const ProjectRootDocManager = require('../Project/ProjectRootDocManager')
 const ProjectDetailsHandler = require('../Project/ProjectDetailsHandler')
 const ProjectDeleter = require('../Project/ProjectDeleter')
 const TpdsProjectFlusher = require('../ThirdPartyDataStore/TpdsProjectFlusher')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 
 module.exports = {
   createProjectFromZipArchive: callbackify(createProjectFromZipArchive),
diff --git a/services/web/app/src/Features/User/SAMLIdentityManager.js b/services/web/app/src/Features/User/SAMLIdentityManager.js
index 581071be70..58108553d1 100644
--- a/services/web/app/src/Features/User/SAMLIdentityManager.js
+++ b/services/web/app/src/Features/User/SAMLIdentityManager.js
@@ -8,7 +8,7 @@ const SubscriptionLocator = require('../Subscription/SubscriptionLocator')
 const UserAuditLogHandler = require('../User/UserAuditLogHandler')
 const UserGetter = require('../User/UserGetter')
 const UserUpdater = require('../User/UserUpdater')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const { User } = require('../../models/User')
 
 async function _addAuditLogEntry(
diff --git a/services/web/app/src/Features/User/ThirdPartyIdentityManager.js b/services/web/app/src/Features/User/ThirdPartyIdentityManager.js
index 4d318b5668..c1054d8741 100644
--- a/services/web/app/src/Features/User/ThirdPartyIdentityManager.js
+++ b/services/web/app/src/Features/User/ThirdPartyIdentityManager.js
@@ -4,7 +4,7 @@ const EmailHandler = require(`${APP_ROOT}/Features/Email/EmailHandler`)
 const EmailOptionsHelper = require(`${APP_ROOT}/Features/Email/EmailOptionsHelper`)
 const Errors = require('../Errors/Errors')
 const _ = require('lodash')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const OError = require('@overleaf/o-error')
 const settings = require('@overleaf/settings')
 const { User } = require(`${APP_ROOT}/models/User`)
diff --git a/services/web/app/src/Features/User/UserController.js b/services/web/app/src/Features/User/UserController.js
index e36fae0364..fbfdec5ee6 100644
--- a/services/web/app/src/Features/User/UserController.js
+++ b/services/web/app/src/Features/User/UserController.js
@@ -4,7 +4,7 @@ const UserGetter = require('./UserGetter')
 const { User } = require('../../models/User')
 const NewsletterManager = require('../Newsletter/NewsletterManager')
 const UserRegistrationHandler = require('./UserRegistrationHandler')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const metrics = require('@overleaf/metrics')
 const AuthenticationManager = require('../Authentication/AuthenticationManager')
 const SessionManager = require('../Authentication/SessionManager')
diff --git a/services/web/app/src/Features/User/UserCreator.js b/services/web/app/src/Features/User/UserCreator.js
index 52652a828f..828e0e7f83 100644
--- a/services/web/app/src/Features/User/UserCreator.js
+++ b/services/web/app/src/Features/User/UserCreator.js
@@ -1,4 +1,4 @@
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const util = require('util')
 const { AffiliationError } = require('../Errors/Errors')
 const Features = require('../../infrastructure/Features')
diff --git a/services/web/app/src/Features/User/UserDeleter.js b/services/web/app/src/Features/User/UserDeleter.js
index 159c13bdf4..a183978cb8 100644
--- a/services/web/app/src/Features/User/UserDeleter.js
+++ b/services/web/app/src/Features/User/UserDeleter.js
@@ -1,5 +1,5 @@
 const { callbackify } = require('util')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const moment = require('moment')
 const { User } = require('../../models/User')
 const { DeletedUser } = require('../../models/DeletedUser')
diff --git a/services/web/app/src/Features/User/UserEmailsController.js b/services/web/app/src/Features/User/UserEmailsController.js
index d546347876..5538911e3a 100644
--- a/services/web/app/src/Features/User/UserEmailsController.js
+++ b/services/web/app/src/Features/User/UserEmailsController.js
@@ -1,4 +1,4 @@
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const SessionManager = require('../Authentication/SessionManager')
 const UserGetter = require('./UserGetter')
 const UserUpdater = require('./UserUpdater')
diff --git a/services/web/app/src/Features/User/UserGetter.js b/services/web/app/src/Features/User/UserGetter.js
index 1c2d98f7bd..54d4a73329 100644
--- a/services/web/app/src/Features/User/UserGetter.js
+++ b/services/web/app/src/Features/User/UserGetter.js
@@ -1,7 +1,7 @@
 const { callbackify } = require('util')
 const { db } = require('../../infrastructure/mongodb')
 const metrics = require('@overleaf/metrics')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const moment = require('moment')
 const settings = require('@overleaf/settings')
 const { promisifyAll } = require('../../util/promises')
diff --git a/services/web/app/src/Features/User/UserPagesController.js b/services/web/app/src/Features/User/UserPagesController.js
index a3eb86d170..63c445c3ba 100644
--- a/services/web/app/src/Features/User/UserPagesController.js
+++ b/services/web/app/src/Features/User/UserPagesController.js
@@ -1,7 +1,7 @@
 const UserGetter = require('./UserGetter')
 const OError = require('@overleaf/o-error')
 const UserSessionsManager = require('./UserSessionsManager')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const Settings = require('@overleaf/settings')
 const AuthenticationController = require('../Authentication/AuthenticationController')
 const SessionManager = require('../Authentication/SessionManager')
diff --git a/services/web/app/src/Features/User/UserRegistrationHandler.js b/services/web/app/src/Features/User/UserRegistrationHandler.js
index 377bf2dd7c..a45b6dbcc8 100644
--- a/services/web/app/src/Features/User/UserRegistrationHandler.js
+++ b/services/web/app/src/Features/User/UserRegistrationHandler.js
@@ -4,7 +4,7 @@ const UserGetter = require('./UserGetter')
 const AuthenticationManager = require('../Authentication/AuthenticationManager')
 const NewsletterManager = require('../Newsletter/NewsletterManager')
 const async = require('async')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const crypto = require('crypto')
 const EmailHandler = require('../Email/EmailHandler')
 const OneTimeTokenHandler = require('../Security/OneTimeTokenHandler')
diff --git a/services/web/app/src/Features/User/UserSessionsManager.js b/services/web/app/src/Features/User/UserSessionsManager.js
index e8839204b8..ce1abf1f0c 100644
--- a/services/web/app/src/Features/User/UserSessionsManager.js
+++ b/services/web/app/src/Features/User/UserSessionsManager.js
@@ -1,6 +1,6 @@
 const OError = require('@overleaf/o-error')
 const Settings = require('@overleaf/settings')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const Async = require('async')
 const _ = require('underscore')
 const { promisify } = require('util')
diff --git a/services/web/app/src/Features/User/UserUpdater.js b/services/web/app/src/Features/User/UserUpdater.js
index 9008e8ffa4..a565cd5523 100644
--- a/services/web/app/src/Features/User/UserUpdater.js
+++ b/services/web/app/src/Features/User/UserUpdater.js
@@ -1,4 +1,4 @@
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const OError = require('@overleaf/o-error')
 const { db } = require('../../infrastructure/mongodb')
 const { normalizeQuery } = require('../Helpers/Mongo')
diff --git a/services/web/app/src/Features/UserMembership/UserMembershipHandler.js b/services/web/app/src/Features/UserMembership/UserMembershipHandler.js
index 46b727f350..6a70cfa764 100644
--- a/services/web/app/src/Features/UserMembership/UserMembershipHandler.js
+++ b/services/web/app/src/Features/UserMembership/UserMembershipHandler.js
@@ -23,7 +23,7 @@ const EntityModels = {
 }
 const UserMembershipViewModel = require('./UserMembershipViewModel')
 const UserGetter = require('../User/UserGetter')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const UserMembershipEntityConfigs = require('./UserMembershipEntityConfigs')
 
 const UserMembershipHandler = {
diff --git a/services/web/app/src/Features/V1/V1Handler.js b/services/web/app/src/Features/V1/V1Handler.js
index a76bfa4220..beeb40bdec 100644
--- a/services/web/app/src/Features/V1/V1Handler.js
+++ b/services/web/app/src/Features/V1/V1Handler.js
@@ -16,7 +16,7 @@ let V1Handler
 const OError = require('@overleaf/o-error')
 const V1Api = require('./V1Api')
 const Settings = require('@overleaf/settings')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 
 module.exports = V1Handler = {
   authWithV1(email, password, callback) {
diff --git a/services/web/app/src/infrastructure/ExpressLocals.js b/services/web/app/src/infrastructure/ExpressLocals.js
index 6fd52ad6c4..526a4cbd03 100644
--- a/services/web/app/src/infrastructure/ExpressLocals.js
+++ b/services/web/app/src/infrastructure/ExpressLocals.js
@@ -1,4 +1,4 @@
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const Settings = require('@overleaf/settings')
 const querystring = require('querystring')
 const _ = require('lodash')
diff --git a/services/web/app/src/infrastructure/FileWriter.js b/services/web/app/src/infrastructure/FileWriter.js
index 5cdf5ca7f1..a5301b22e1 100644
--- a/services/web/app/src/infrastructure/FileWriter.js
+++ b/services/web/app/src/infrastructure/FileWriter.js
@@ -12,7 +12,7 @@
  */
 const fs = require('fs')
 const OError = require('@overleaf/o-error')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const uuid = require('uuid')
 const _ = require('underscore')
 const Settings = require('@overleaf/settings')
diff --git a/services/web/app/src/infrastructure/GeoIpLookup.js b/services/web/app/src/infrastructure/GeoIpLookup.js
index 27e7874055..59ab8f5c23 100644
--- a/services/web/app/src/infrastructure/GeoIpLookup.js
+++ b/services/web/app/src/infrastructure/GeoIpLookup.js
@@ -1,7 +1,7 @@
 const request = require('request')
 const settings = require('@overleaf/settings')
 const _ = require('underscore')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const { URL } = require('url')
 const { promisify, promisifyMultiResult } = require('../util/promises')
 
diff --git a/services/web/app/src/infrastructure/LockManager.js b/services/web/app/src/infrastructure/LockManager.js
index 4d58b4be9f..4e8adfc98f 100644
--- a/services/web/app/src/infrastructure/LockManager.js
+++ b/services/web/app/src/infrastructure/LockManager.js
@@ -2,7 +2,7 @@ const { callbackify, promisify } = require('util')
 const metrics = require('@overleaf/metrics')
 const RedisWrapper = require('./RedisWrapper')
 const rclient = RedisWrapper.client('lock')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const os = require('os')
 const crypto = require('crypto')
 const async = require('async')
diff --git a/services/web/app/src/infrastructure/Mongoose.js b/services/web/app/src/infrastructure/Mongoose.js
index b4eee7fa80..f680abe94c 100644
--- a/services/web/app/src/infrastructure/Mongoose.js
+++ b/services/web/app/src/infrastructure/Mongoose.js
@@ -1,6 +1,6 @@
 const mongoose = require('mongoose')
 const Settings = require('@overleaf/settings')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 
 if (
   typeof global.beforeEach === 'function' &&
diff --git a/services/web/app/src/infrastructure/ProxyManager.js b/services/web/app/src/infrastructure/ProxyManager.js
index 6cc0ecebed..bbeff7b1d0 100644
--- a/services/web/app/src/infrastructure/ProxyManager.js
+++ b/services/web/app/src/infrastructure/ProxyManager.js
@@ -12,7 +12,7 @@
  */
 let ProxyManager
 const settings = require('@overleaf/settings')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const request = require('request')
 const { URL, URLSearchParams } = require('url')
 
diff --git a/services/web/app/src/infrastructure/Server.js b/services/web/app/src/infrastructure/Server.js
index e940a4b3ab..199c52a071 100644
--- a/services/web/app/src/infrastructure/Server.js
+++ b/services/web/app/src/infrastructure/Server.js
@@ -1,7 +1,7 @@
 const Path = require('path')
 const express = require('express')
 const Settings = require('@overleaf/settings')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const metrics = require('@overleaf/metrics')
 const expressLocals = require('./ExpressLocals')
 const Validation = require('./Validation')
diff --git a/services/web/app/src/infrastructure/SessionStoreManager.js b/services/web/app/src/infrastructure/SessionStoreManager.js
index 9233730f92..a9ef6bdd21 100644
--- a/services/web/app/src/infrastructure/SessionStoreManager.js
+++ b/services/web/app/src/infrastructure/SessionStoreManager.js
@@ -1,5 +1,5 @@
 const Metrics = require('@overleaf/metrics')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 
 function computeValidationToken(req) {
   // this should be a deterministic function of the client-side sessionID,
diff --git a/services/web/app/src/infrastructure/Views.js b/services/web/app/src/infrastructure/Views.js
index 1460006eb7..e1323a823d 100644
--- a/services/web/app/src/infrastructure/Views.js
+++ b/services/web/app/src/infrastructure/Views.js
@@ -1,4 +1,4 @@
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const pug = require('pug')
 const globby = require('globby')
 const Settings = require('@overleaf/settings')
diff --git a/services/web/app/src/models/Institution.js b/services/web/app/src/models/Institution.js
index 79aa0cf27a..7b44012405 100644
--- a/services/web/app/src/models/Institution.js
+++ b/services/web/app/src/models/Institution.js
@@ -2,7 +2,7 @@ const mongoose = require('../infrastructure/Mongoose')
 const { Schema } = mongoose
 const { ObjectId } = Schema
 const settings = require('@overleaf/settings')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const request = require('request')
 
 const InstitutionSchema = new Schema({
diff --git a/services/web/app/src/models/Publisher.js b/services/web/app/src/models/Publisher.js
index 84002a955a..b19a0b4cac 100644
--- a/services/web/app/src/models/Publisher.js
+++ b/services/web/app/src/models/Publisher.js
@@ -2,7 +2,7 @@ const mongoose = require('../infrastructure/Mongoose')
 const { Schema } = mongoose
 const { ObjectId } = Schema
 const settings = require('@overleaf/settings')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const request = require('request')
 
 const PublisherSchema = new Schema({
diff --git a/services/web/app/src/router.js b/services/web/app/src/router.js
index 290389c752..34144a55ed 100644
--- a/services/web/app/src/router.js
+++ b/services/web/app/src/router.js
@@ -56,7 +56,7 @@ const {
   unsupportedBrowserMiddleware,
 } = require('./infrastructure/UnsupportedBrowserMiddleware')
 
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const _ = require('underscore')
 
 module.exports = { initialize }
diff --git a/services/web/modules/launchpad/app/src/LaunchpadController.js b/services/web/modules/launchpad/app/src/LaunchpadController.js
index 1ddd90557a..a46c4d83c5 100644
--- a/services/web/modules/launchpad/app/src/LaunchpadController.js
+++ b/services/web/modules/launchpad/app/src/LaunchpadController.js
@@ -16,7 +16,7 @@ const OError = require('@overleaf/o-error')
 const Settings = require('@overleaf/settings')
 const Path = require('path')
 const Url = require('url')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const metrics = require('@overleaf/metrics')
 const UserRegistrationHandler = require('../../../../app/src/Features/User/UserRegistrationHandler')
 const EmailHandler = require('../../../../app/src/Features/Email/EmailHandler')
diff --git a/services/web/modules/launchpad/app/src/LaunchpadRouter.js b/services/web/modules/launchpad/app/src/LaunchpadRouter.js
index 21d8a58b48..5c88c9fbf4 100644
--- a/services/web/modules/launchpad/app/src/LaunchpadRouter.js
+++ b/services/web/modules/launchpad/app/src/LaunchpadRouter.js
@@ -9,7 +9,7 @@
  * DS207: Consider shorter variations of null checks
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const LaunchpadController = require('./LaunchpadController')
 const AuthenticationController = require('../../../../app/src/Features/Authentication/AuthenticationController')
 const AuthorizationMiddleware = require('../../../../app/src/Features/Authorization/AuthorizationMiddleware')
diff --git a/services/web/modules/user-activate/app/src/UserActivateRouter.js b/services/web/modules/user-activate/app/src/UserActivateRouter.js
index a63cb9d1ad..18ebaeb9c3 100644
--- a/services/web/modules/user-activate/app/src/UserActivateRouter.js
+++ b/services/web/modules/user-activate/app/src/UserActivateRouter.js
@@ -1,4 +1,4 @@
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const UserActivateController = require('./UserActivateController')
 const AuthenticationController = require('../../../../app/src/Features/Authentication/AuthenticationController')
 
diff --git a/services/web/package-lock.json b/services/web/package-lock.json
index af53ee9e17..d816b6a886 100644
--- a/services/web/package-lock.json
+++ b/services/web/package-lock.json
@@ -5201,9 +5201,9 @@
       }
     },
     "@google-cloud/debug-agent": {
-      "version": "5.2.8",
-      "resolved": "https://registry.npmjs.org/@google-cloud/debug-agent/-/debug-agent-5.2.8.tgz",
-      "integrity": "sha512-HL7yMAzAagmPmRT7Xl2cCNBylxYOz9BSFfU9GFrq1/OiP5DoG4wTPBonk3DP1ODKmXA2BoqmtNNPee2gZVVZbw==",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/@google-cloud/debug-agent/-/debug-agent-5.1.3.tgz",
+      "integrity": "sha512-WbzeEz4MvPlM7DX2QBsPcWgF62u7LSQv/oMYPl0L+TddTebqjDKiVXwxpzWk61NIfcKiet3dyCbPIt3N5o8XPQ==",
       "requires": {
         "@google-cloud/common": "^3.0.0",
         "acorn": "^8.0.0",
@@ -5214,14 +5214,14 @@
         "gcp-metadata": "^4.0.0",
         "p-limit": "^3.0.1",
         "semver": "^7.0.0",
-        "source-map": "^0.7.3",
+        "source-map": "^0.6.1",
         "split": "^1.0.0"
       },
       "dependencies": {
         "acorn": {
-          "version": "8.5.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz",
-          "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q=="
+          "version": "8.0.5",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.0.5.tgz",
+          "integrity": "sha512-v+DieK/HJkJOpFBETDJioequtc3PfxsWMaxIdIwujtF7FEV/MAyDQLlm6/zPvr7Mix07mLh6ccVwIsloceodlg=="
         },
         "p-limit": {
           "version": "3.1.0",
@@ -5232,17 +5232,17 @@
           }
         },
         "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "version": "7.3.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
+          "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
           "requires": {
             "lru-cache": "^6.0.0"
           }
         },
         "source-map": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         }
       }
     },
@@ -5447,29 +5447,54 @@
       }
     },
     "@google-cloud/profiler": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@google-cloud/profiler/-/profiler-4.1.5.tgz",
-      "integrity": "sha512-n+HAOicoPRo0JXwxWpDYdLN+M0gIqdQdMp77oe1B+bJY+5d4W2ye5e1SpxsDjcSC5864jO+xEd0tn/d7rMvS7g==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@google-cloud/profiler/-/profiler-4.1.0.tgz",
+      "integrity": "sha512-9e1zXRctLSUHAoAsFGwE4rS28fr0siiG+jXl5OpwTK8ZAUlxb70aosHaZGdsv8YXrYKjuiufjRZ/OXCs0XLI9g==",
       "requires": {
         "@google-cloud/common": "^3.0.0",
         "@types/console-log-level": "^1.4.0",
         "@types/semver": "^7.0.0",
         "console-log-level": "^1.4.0",
-        "delay": "^5.0.0",
+        "delay": "^4.0.1",
         "extend": "^3.0.2",
         "gcp-metadata": "^4.0.0",
-        "parse-duration": "^1.0.0",
-        "pprof": "3.2.0",
+        "parse-duration": "^0.4.4",
+        "pprof": "3.0.0",
         "pretty-ms": "^7.0.0",
-        "protobufjs": "~6.11.0",
+        "protobufjs": "~6.10.0",
         "semver": "^7.0.0",
         "teeny-request": "^7.0.0"
       },
       "dependencies": {
+        "@types/node": {
+          "version": "13.13.42",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.42.tgz",
+          "integrity": "sha512-g+w2QgbW7k2CWLOXzQXbO37a7v5P9ObPvYahKphdBLV5aqpbVZRhTpWCT0SMRqX1i30Aig791ZmIM2fJGL2S8A=="
+        },
+        "protobufjs": {
+          "version": "6.10.2",
+          "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.10.2.tgz",
+          "integrity": "sha512-27yj+04uF6ya9l+qfpH187aqEzfCF4+Uit0I9ZBQVqK09hk/SQzKa2MUqUpXaVa7LOFRg1TSSr3lVxGOk6c0SQ==",
+          "requires": {
+            "@protobufjs/aspromise": "^1.1.2",
+            "@protobufjs/base64": "^1.1.2",
+            "@protobufjs/codegen": "^2.0.4",
+            "@protobufjs/eventemitter": "^1.1.0",
+            "@protobufjs/fetch": "^1.1.0",
+            "@protobufjs/float": "^1.0.2",
+            "@protobufjs/inquire": "^1.1.0",
+            "@protobufjs/path": "^1.1.2",
+            "@protobufjs/pool": "^1.1.0",
+            "@protobufjs/utf8": "^1.1.0",
+            "@types/long": "^4.0.1",
+            "@types/node": "^13.7.0",
+            "long": "^4.0.0"
+          }
+        },
         "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "version": "7.3.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
+          "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
           "requires": {
             "lru-cache": "^6.0.0"
           }
@@ -5643,12 +5668,12 @@
       }
     },
     "@google-cloud/trace-agent": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/@google-cloud/trace-agent/-/trace-agent-5.1.5.tgz",
-      "integrity": "sha512-8Mrspg9nebd1VA4xC+XQTBBY3PV3SoUR70CHc3waN9lZskrCQO0Ha50VamhtUx8gUMgUK8ANed5EsF8rv+jY4Q==",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/@google-cloud/trace-agent/-/trace-agent-5.1.3.tgz",
+      "integrity": "sha512-f+5DX7n6QpDlHA+4kr81z69SLAdrlvd9T8skqCMgnYvtXx14AwzXZyzEDf3jppOYzYoqPPJv8XYiyYHHmYD0BA==",
       "requires": {
         "@google-cloud/common": "^3.0.0",
-        "@opencensus/propagation-stackdriver": "0.1.0",
+        "@opencensus/propagation-stackdriver": "0.0.22",
         "builtin-modules": "^3.0.0",
         "console-log-level": "^1.4.0",
         "continuation-local-storage": "^3.2.1",
@@ -5665,28 +5690,6 @@
         "uuid": "^8.0.0"
       },
       "dependencies": {
-        "@opencensus/core": {
-          "version": "0.1.0",
-          "resolved": "https://registry.npmjs.org/@opencensus/core/-/core-0.1.0.tgz",
-          "integrity": "sha512-Bdbi5vi44a1fwyHNyKh6bwzuFZJeZJPhzdwogk/Kw5juoEeRGPworK1sgtB3loeR8cqLyi5us0mz9h0xqINiSQ==",
-          "requires": {
-            "continuation-local-storage": "^3.2.1",
-            "log-driver": "^1.2.7",
-            "semver": "^7.0.0",
-            "shimmer": "^1.2.0",
-            "uuid": "^8.0.0"
-          }
-        },
-        "@opencensus/propagation-stackdriver": {
-          "version": "0.1.0",
-          "resolved": "https://registry.npmjs.org/@opencensus/propagation-stackdriver/-/propagation-stackdriver-0.1.0.tgz",
-          "integrity": "sha512-YLklu8jnnYKaJ8gUFz3rM0FVdsWXEJAMLzeeU4JRac6LI34raENy4kvRezZtNEFS5KthaJUsYg04sPc/Ag0w4w==",
-          "requires": {
-            "@opencensus/core": "^0.1.0",
-            "hex2dec": "^1.0.1",
-            "uuid": "^8.0.0"
-          }
-        },
         "arrify": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
@@ -5698,9 +5701,9 @@
           "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
         },
         "google-auth-library": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.10.1.tgz",
-          "integrity": "sha512-nQxgM1ZopUMcpMnu95kOSzI+9tJl4YDOZJomSTBGlRLpxfBopdwto7WvzoI87HuN0nQqVETgOsHi/C/po1rppA==",
+          "version": "7.0.2",
+          "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.0.2.tgz",
+          "integrity": "sha512-vjyNZR3pDLC0u7GHLfj+Hw9tGprrJwoMwkYGqURCXYITjCrP9HprOyxVV+KekdLgATtWGuDkQG2MTh0qpUPUgg==",
           "requires": {
             "arrify": "^2.0.0",
             "base64-js": "^1.3.0",
@@ -5733,9 +5736,9 @@
           }
         },
         "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "version": "7.3.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
+          "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
           "requires": {
             "lru-cache": "^6.0.0"
           }
@@ -6413,91 +6416,25 @@
         "@otplib/plugin-thirty-two": "^12.0.1"
       }
     },
-    "@overleaf/logger": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@overleaf/logger/-/logger-3.0.0.tgz",
-      "integrity": "sha512-6sGtl3TK1a6WxHhNkAO1GLxmiQwUga0CBIAAj1/eobmXp/GAjDarVne9FEHAEoB5VsJqKXEIqK11ngeqf5m3Yg==",
-      "requires": {
-        "@google-cloud/logging-bunyan": "^3.1.0",
-        "@overleaf/o-error": "^3.0.0",
-        "@sentry/node": "^6.13.2",
-        "bunyan": "^1.8.14",
-        "node-fetch": "^2.6.1",
-        "yn": "^4.0.0"
-      },
-      "dependencies": {
-        "@google-cloud/logging-bunyan": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/@google-cloud/logging-bunyan/-/logging-bunyan-3.1.1.tgz",
-          "integrity": "sha512-BIO17OWmdZVIYjbDHC0mt8DtY2edCHZ7B53DXjl8wZbC5gFrB3Vvvuhc4KIZ525f3vqFNLfBRvxkw/k+fhp5IA==",
-          "requires": {
-            "@google-cloud/logging": "^9.0.0",
-            "google-auth-library": "^7.0.0"
-          }
-        },
-        "arrify": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
-          "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug=="
-        },
-        "base64-js": {
-          "version": "1.5.1",
-          "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-          "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
-        },
-        "google-auth-library": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.10.1.tgz",
-          "integrity": "sha512-nQxgM1ZopUMcpMnu95kOSzI+9tJl4YDOZJomSTBGlRLpxfBopdwto7WvzoI87HuN0nQqVETgOsHi/C/po1rppA==",
-          "requires": {
-            "arrify": "^2.0.0",
-            "base64-js": "^1.3.0",
-            "ecdsa-sig-formatter": "^1.0.11",
-            "fast-text-encoding": "^1.0.0",
-            "gaxios": "^4.0.0",
-            "gcp-metadata": "^4.2.0",
-            "gtoken": "^5.0.4",
-            "jws": "^4.0.0",
-            "lru-cache": "^6.0.0"
-          }
-        },
-        "jwa": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz",
-          "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==",
-          "requires": {
-            "buffer-equal-constant-time": "1.0.1",
-            "ecdsa-sig-formatter": "1.0.11",
-            "safe-buffer": "^5.0.1"
-          }
-        },
-        "jws": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz",
-          "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==",
-          "requires": {
-            "jwa": "^2.0.0",
-            "safe-buffer": "^5.0.1"
-          }
-        },
-        "yn": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/yn/-/yn-4.0.0.tgz",
-          "integrity": "sha512-huWiiCS4TxKc4SfgmTwW1K7JmXPPAmuXWYy4j9qjQo4+27Kni8mGhAAi1cloRWmBe2EqcLgt3IGqQoRL/MtPgg=="
-        }
-      }
-    },
     "@overleaf/metrics": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@overleaf/metrics/-/metrics-4.0.0.tgz",
-      "integrity": "sha512-qvQ3WSyVEqfuJ5intfh4aWIekFIDkNCsocG9acg9445L/QIK3MV7j3DkQ/IsXgD8TdOOLHWLKETCrxWKMNtw7Q==",
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/@overleaf/metrics/-/metrics-3.5.1.tgz",
+      "integrity": "sha512-RLHxkMF7Y3725L3QwXo9cIn2gGobsMYUGuxKxg7PVMrPTMsomHEMeG7StOxCO7ML1Z/BwB/9nsVYNrsRdAJtKg==",
       "requires": {
         "@google-cloud/debug-agent": "^5.1.2",
-        "@google-cloud/profiler": "^4.1.3",
+        "@google-cloud/profiler": "^4.0.3",
         "@google-cloud/trace-agent": "^5.1.1",
         "compression": "^1.7.4",
         "prom-client": "^11.1.3",
+        "underscore": "~1.6.0",
         "yn": "^3.1.1"
+      },
+      "dependencies": {
+        "underscore": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
+          "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag="
+        }
       }
     },
     "@overleaf/o-error": {
@@ -6962,123 +6899,6 @@
         "tslib": "^1.9.3"
       }
     },
-    "@sentry/node": {
-      "version": "6.13.3",
-      "resolved": "https://registry.npmjs.org/@sentry/node/-/node-6.13.3.tgz",
-      "integrity": "sha512-ZeZSw+TcPcf4e0j7iEqNMtoVmz+WFW/TEoGokXIwysZqSgchKdAXDHqn+CqUqFan7d76JcJmzztAUK2JruQ2Kg==",
-      "requires": {
-        "@sentry/core": "6.13.3",
-        "@sentry/hub": "6.13.3",
-        "@sentry/tracing": "6.13.3",
-        "@sentry/types": "6.13.3",
-        "@sentry/utils": "6.13.3",
-        "cookie": "^0.4.1",
-        "https-proxy-agent": "^5.0.0",
-        "lru_map": "^0.3.3",
-        "tslib": "^1.9.3"
-      },
-      "dependencies": {
-        "@sentry/core": {
-          "version": "6.13.3",
-          "resolved": "https://registry.npmjs.org/@sentry/core/-/core-6.13.3.tgz",
-          "integrity": "sha512-obm3SjgCk8A7nB37b2AU1eq1q7gMoJRrGMv9VRIyfcG0Wlz/5lJ9O3ohUk+YZaaVfZMxXn6hFtsBiOWmlv7IIA==",
-          "requires": {
-            "@sentry/hub": "6.13.3",
-            "@sentry/minimal": "6.13.3",
-            "@sentry/types": "6.13.3",
-            "@sentry/utils": "6.13.3",
-            "tslib": "^1.9.3"
-          }
-        },
-        "@sentry/hub": {
-          "version": "6.13.3",
-          "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-6.13.3.tgz",
-          "integrity": "sha512-eYppBVqvhs5cvm33snW2sxfcw6G20/74RbBn+E4WDo15hozis89kU7ZCJDOPkXuag3v1h9igns/kM6PNBb41dw==",
-          "requires": {
-            "@sentry/types": "6.13.3",
-            "@sentry/utils": "6.13.3",
-            "tslib": "^1.9.3"
-          }
-        },
-        "@sentry/minimal": {
-          "version": "6.13.3",
-          "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.13.3.tgz",
-          "integrity": "sha512-63MlYYRni3fs5Bh8XBAfVZ+ctDdWg0fapSTP1ydIC37fKvbE+5zhyUqwrEKBIiclEApg1VKX7bkKxVdu/vsFdw==",
-          "requires": {
-            "@sentry/hub": "6.13.3",
-            "@sentry/types": "6.13.3",
-            "tslib": "^1.9.3"
-          }
-        },
-        "@sentry/types": {
-          "version": "6.13.3",
-          "resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.13.3.tgz",
-          "integrity": "sha512-Vrz5CdhaTRSvCQjSyIFIaV9PodjAVFkzJkTRxyY7P77RcegMsRSsG1yzlvCtA99zG9+e6MfoJOgbOCwuZids5A=="
-        },
-        "@sentry/utils": {
-          "version": "6.13.3",
-          "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.13.3.tgz",
-          "integrity": "sha512-zYFuFH3MaYtBZTeJ4Yajg7pDf0pM3MWs3+9k5my9Fd+eqNcl7dYQYJbT9gyC0HXK1QI4CAMNNlHNl4YXhF91ag==",
-          "requires": {
-            "@sentry/types": "6.13.3",
-            "tslib": "^1.9.3"
-          }
-        },
-        "cookie": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz",
-          "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="
-        }
-      }
-    },
-    "@sentry/tracing": {
-      "version": "6.13.3",
-      "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-6.13.3.tgz",
-      "integrity": "sha512-yyOFIhqlprPM0g4f35Icear3eZk2mwyYcGEzljJfY2iU6pJwj1lzia5PfSwiCW7jFGMmlBJNhOAIpfhlliZi8Q==",
-      "requires": {
-        "@sentry/hub": "6.13.3",
-        "@sentry/minimal": "6.13.3",
-        "@sentry/types": "6.13.3",
-        "@sentry/utils": "6.13.3",
-        "tslib": "^1.9.3"
-      },
-      "dependencies": {
-        "@sentry/hub": {
-          "version": "6.13.3",
-          "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-6.13.3.tgz",
-          "integrity": "sha512-eYppBVqvhs5cvm33snW2sxfcw6G20/74RbBn+E4WDo15hozis89kU7ZCJDOPkXuag3v1h9igns/kM6PNBb41dw==",
-          "requires": {
-            "@sentry/types": "6.13.3",
-            "@sentry/utils": "6.13.3",
-            "tslib": "^1.9.3"
-          }
-        },
-        "@sentry/minimal": {
-          "version": "6.13.3",
-          "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.13.3.tgz",
-          "integrity": "sha512-63MlYYRni3fs5Bh8XBAfVZ+ctDdWg0fapSTP1ydIC37fKvbE+5zhyUqwrEKBIiclEApg1VKX7bkKxVdu/vsFdw==",
-          "requires": {
-            "@sentry/hub": "6.13.3",
-            "@sentry/types": "6.13.3",
-            "tslib": "^1.9.3"
-          }
-        },
-        "@sentry/types": {
-          "version": "6.13.3",
-          "resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.13.3.tgz",
-          "integrity": "sha512-Vrz5CdhaTRSvCQjSyIFIaV9PodjAVFkzJkTRxyY7P77RcegMsRSsG1yzlvCtA99zG9+e6MfoJOgbOCwuZids5A=="
-        },
-        "@sentry/utils": {
-          "version": "6.13.3",
-          "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.13.3.tgz",
-          "integrity": "sha512-zYFuFH3MaYtBZTeJ4Yajg7pDf0pM3MWs3+9k5my9Fd+eqNcl7dYQYJbT9gyC0HXK1QI4CAMNNlHNl4YXhF91ag==",
-          "requires": {
-            "@sentry/types": "6.13.3",
-            "tslib": "^1.9.3"
-          }
-        }
-      }
-    },
     "@sentry/types": {
       "version": "6.3.5",
       "resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.3.5.tgz",
@@ -10824,9 +10644,9 @@
       }
     },
     "@types/console-log-level": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/@types/console-log-level/-/console-log-level-1.4.2.tgz",
-      "integrity": "sha512-TnhDAntcJthcCMrR3OAKAUjgHyQgoms1yaBJepGv+BtXi8PLf8aX2L/NMCfofRTpVqW0bLklpGTsuqmUSCR2Uw=="
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@types/console-log-level/-/console-log-level-1.4.0.tgz",
+      "integrity": "sha512-x+OscEQwcx5Biair4enH7ov9W+clcqUWaZRaxn5IkT4yNWWjRr2oiYDkY/x1uXSTVZOQ2xlbFQySaQGB+VdXGQ=="
     },
     "@types/events": {
       "version": "3.0.0",
@@ -11151,9 +10971,9 @@
       }
     },
     "@types/semver": {
-      "version": "7.3.9",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.9.tgz",
-      "integrity": "sha512-L/TMpyURfBkf+o/526Zb6kd/tchUP3iBDEPjqjb+U2MAJhVRxxrmr2fwpe08E7QsV7YLcpq0tUaQ9O9x97ZIxQ=="
+      "version": "7.3.4",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.4.tgz",
+      "integrity": "sha512-+nVsLKlcUCeMzD2ufHEYuJ9a2ovstb6Dp52A5VsoKxDXgvE051XgHI/33I1EymwkRGQkwnA0LkhnUzituGs4EQ=="
     },
     "@types/serve-static": {
       "version": "1.13.10",
@@ -15850,9 +15670,9 @@
       "integrity": "sha512-HT6PKVqkwpzwB3jl5hXFoQteEWXbSWMzG3Z8RVYlx8hZwCOLCy4NU7vkSB3dYX3e6ORwRfGw4uFOXaw4rn/a9Q=="
     },
     "coffeescript": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-2.6.1.tgz",
-      "integrity": "sha512-GG5nkF93qII8HmHqnnibkgpp/SV7PSnSPiWsbinwya7nNOe95aE/x2xrKZJFks8Qpko3TNrC+/LahaKgrz5YCg=="
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-2.5.1.tgz",
+      "integrity": "sha512-J2jRPX0eeFh5VKyVnoLrfVFgLZtnnmp96WQSLAS8OrLm2wtQLcnikYKe1gViJKDH7vucjuhHvBKKBP3rKcD1tQ=="
     },
     "collapse-white-space": {
       "version": "1.0.6",
@@ -15902,11 +15722,6 @@
         "simple-swizzle": "^0.2.2"
       }
     },
-    "color-support": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="
-    },
     "colorette": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz",
@@ -17228,7 +17043,7 @@
     "d64": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/d64/-/d64-1.0.0.tgz",
-      "integrity": "sha1-QAKofoUMv8n52XBrYPymE6MzbpA="
+      "integrity": "sha512-5eNy3WZziVYnrogqgXhcdEmqcDB2IHurTqLcrgssJsfkMVCUoUaZpK6cJjxxvLV2dUm5SuJMNcYfVGoin9UIRw=="
     },
     "damerau-levenshtein": {
       "version": "1.0.6",
@@ -17533,9 +17348,9 @@
       }
     },
     "delay": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/delay/-/delay-5.0.0.tgz",
-      "integrity": "sha512-ReEBKkIfe4ya47wlPYf/gu5ib6yUG0/Aez0JQZQz94kiWtRQvZIQbTiehsnwHvLSWJnQdhVeqYue7Id1dKr0qw=="
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/delay/-/delay-4.4.1.tgz",
+      "integrity": "sha512-aL3AhqtfhOlT/3ai6sWXeqwnw63ATNpnUiN4HL7x9q+My5QtHlO3OIkasmug9LKzpheLdmUKGRKnYXYAS7FQkQ=="
     },
     "delayed-stream": {
       "version": "1.0.0",
@@ -19938,7 +19753,7 @@
     "expressionify": {
       "version": "0.9.3",
       "resolved": "https://registry.npmjs.org/expressionify/-/expressionify-0.9.3.tgz",
-      "integrity": "sha1-/iJnx+hpRXfxP02oML/DyNgXf5I="
+      "integrity": "sha512-ZhmYFs8RPiRcXrDUNgABPNjtScZvShmKAKeWA6VP4c07eNCfz7B6WsAnBH+XLiDUXj8mFoX1i25pwQvuNW5PYg=="
     },
     "ext": {
       "version": "1.4.0",
@@ -21085,7 +20900,7 @@
     "functional-red-black-tree": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+      "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==",
       "dev": true
     },
     "functions-have-names": {
@@ -25382,7 +25197,7 @@
     "lodash.camelcase": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
-      "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY="
+      "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA=="
     },
     "lodash.debounce": {
       "version": "4.0.8",
@@ -25673,11 +25488,6 @@
         }
       }
     },
-    "lru_map": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/lru_map/-/lru_map-0.3.3.tgz",
-      "integrity": "sha1-tcg1G5Rky9dQM1p5ZQoOwOVhGN0="
-    },
     "lz-string": {
       "version": "1.4.4",
       "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.4.4.tgz",
@@ -26054,7 +25864,7 @@
     "microtime-nodejs": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/microtime-nodejs/-/microtime-nodejs-1.0.0.tgz",
-      "integrity": "sha1-iFlASvLipGKhXJzWvyxORo2r2+g="
+      "integrity": "sha512-SthP/4JW6HUIZfgM0nadNtwKm/WMH0+z1i4RsPDnud+UasjoABzSkCk3eMhIRzipgwPhkdAYpTI69X4II4j1pA=="
     },
     "miller-rabin": {
       "version": "4.0.1",
@@ -26265,6 +26075,7 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
       "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+      "dev": true,
       "requires": {
         "minipass": "^3.0.0",
         "yallist": "^4.0.0"
@@ -26274,6 +26085,7 @@
           "version": "3.1.3",
           "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
           "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
+          "dev": true,
           "requires": {
             "yallist": "^4.0.0"
           }
@@ -26330,7 +26142,7 @@
     "mkdirp": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha512-SknJC52obPfGQPnjIkXbmA6+5H15E+fR+E4iR2oQ3zzCLbd7/ONua69R/Gw7AgkTLsRG+r5fzksYwWe1AgTyWA==",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
       "requires": {
         "minimist": "0.0.8"
       },
@@ -27032,7 +26844,7 @@
     "mv": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz",
-      "integrity": "sha1-rmzg1vbV4KT32JN5jQPB6pVZtqI=",
+      "integrity": "sha512-at/ZndSy3xEGJ8i0ygALh8ru9qy7gWW1cmkaqBN29JmMlIvM//MEO9y1sk/avxuwnPcfhkejkLsuPxH81BrkSg==",
       "optional": true,
       "requires": {
         "mkdirp": "~0.5.1",
@@ -27043,7 +26855,7 @@
         "glob": {
           "version": "6.0.4",
           "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
-          "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
+          "integrity": "sha512-MKZeRNyYZAVVVG1oZeLaWie1uweH40m9AZwIwxyPbTSX4hHrVYSzLg0Ro5Z5R7XKkIX+Cc6oD1rqeDJnwsB8/A==",
           "optional": true,
           "requires": {
             "inflight": "^1.0.4",
@@ -27056,7 +26868,7 @@
         "rimraf": {
           "version": "2.4.5",
           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz",
-          "integrity": "sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto=",
+          "integrity": "sha512-J5xnxTyqaiw06JjMftq7L9ouA448dw/E7dKghkP9WpKNuwmARNNg+Gk8/u5ryb9N/Yo2+z3MCwuqFK/+qPOPfQ==",
           "optional": true,
           "requires": {
             "glob": "^6.0.1"
@@ -27118,13 +26930,13 @@
     "natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
       "dev": true
     },
     "ncp": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
-      "integrity": "sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=",
+      "integrity": "sha512-zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA==",
       "optional": true
     },
     "needle": {
@@ -28818,9 +28630,9 @@
       }
     },
     "parse-duration": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/parse-duration/-/parse-duration-1.0.2.tgz",
-      "integrity": "sha512-Dg27N6mfok+ow1a2rj/nRjtCfaKrHUZV2SJpEn/s8GaVUSlf4GGRCRP1c13Hj+wfPKVMrFDqLMLITkYKgKxyyg=="
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/parse-duration/-/parse-duration-0.4.4.tgz",
+      "integrity": "sha512-KbAJuYGUhZkB9gotDiKLnZ7Z3VTacK3fgwmDdB6ZVDtJbMBT6MfLga0WJaYpPDu0mzqT0NgHtHDt5PY4l0nidg=="
     },
     "parse-entities": {
       "version": "2.0.0",
@@ -30000,114 +29812,50 @@
       "dev": true
     },
     "pprof": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/pprof/-/pprof-3.2.0.tgz",
-      "integrity": "sha512-yhORhVWefg94HZgjVa6CDtYSNZJnJzZ82d4pkmrZJxf1/Y29Me/uHYLEVo6KawKKFhQywl5cGbkdnVx9bZoMew==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pprof/-/pprof-3.0.0.tgz",
+      "integrity": "sha512-uPWbAhoH/zvq1kM3/Fd/wshb4D7sLlGap8t6uCTER4aZRWqqyPYgXzpjWbT0Unn5U25pEy2VREUu27nQ9o9VPA==",
       "requires": {
-        "@mapbox/node-pre-gyp": "^1.0.0",
         "bindings": "^1.2.1",
-        "delay": "^5.0.0",
+        "delay": "^4.0.1",
         "findit2": "^2.2.3",
         "nan": "^2.14.0",
+        "node-pre-gyp": "^0.16.0",
         "p-limit": "^3.0.0",
         "pify": "^5.0.0",
-        "protobufjs": "~6.11.0",
+        "protobufjs": "~6.10.0",
         "source-map": "^0.7.3",
         "split": "^1.0.1"
       },
       "dependencies": {
-        "@mapbox/node-pre-gyp": {
-          "version": "1.0.6",
-          "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.6.tgz",
-          "integrity": "sha512-qK1ECws8UxuPqOA8F5LFD90vyVU33W7N3hGfgsOVfrJaRVc8McC3JClTDHpeSbL9CBrOHly/4GsNPAvIgNZE+g==",
-          "requires": {
-            "detect-libc": "^1.0.3",
-            "https-proxy-agent": "^5.0.0",
-            "make-dir": "^3.1.0",
-            "node-fetch": "^2.6.5",
-            "nopt": "^5.0.0",
-            "npmlog": "^5.0.1",
-            "rimraf": "^3.0.2",
-            "semver": "^7.3.5",
-            "tar": "^6.1.11"
-          }
-        },
-        "are-we-there-yet": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
-          "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
-          "requires": {
-            "delegates": "^1.0.0",
-            "readable-stream": "^3.6.0"
-          }
-        },
-        "chownr": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-          "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="
-        },
-        "fs-minipass": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-          "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-          "requires": {
-            "minipass": "^3.0.0"
-          }
-        },
-        "gauge": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.1.tgz",
-          "integrity": "sha512-6STz6KdQgxO4S/ko+AbjlFGGdGcknluoqU+79GOFCDqqyYj5OanQf9AjxwN0jCidtT+ziPMmPSt9E4hfQ0CwIQ==",
-          "requires": {
-            "aproba": "^1.0.3 || ^2.0.0",
-            "color-support": "^1.1.2",
-            "console-control-strings": "^1.0.0",
-            "has-unicode": "^2.0.1",
-            "object-assign": "^4.1.1",
-            "signal-exit": "^3.0.0",
-            "string-width": "^1.0.1 || ^2.0.0",
-            "strip-ansi": "^3.0.1 || ^4.0.0",
-            "wide-align": "^1.1.2"
-          }
-        },
-        "minipass": {
-          "version": "3.1.5",
-          "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz",
-          "integrity": "sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==",
-          "requires": {
-            "yallist": "^4.0.0"
-          }
+        "@types/node": {
+          "version": "13.13.42",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.42.tgz",
+          "integrity": "sha512-g+w2QgbW7k2CWLOXzQXbO37a7v5P9ObPvYahKphdBLV5aqpbVZRhTpWCT0SMRqX1i30Aig791ZmIM2fJGL2S8A=="
         },
         "mkdirp": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
-        },
-        "node-fetch": {
-          "version": "2.6.5",
-          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.5.tgz",
-          "integrity": "sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ==",
+          "version": "0.5.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
           "requires": {
-            "whatwg-url": "^5.0.0"
+            "minimist": "^1.2.5"
           }
         },
-        "nopt": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
-          "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
+        "node-pre-gyp": {
+          "version": "0.16.0",
+          "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.16.0.tgz",
+          "integrity": "sha512-4efGA+X/YXAHLi1hN8KaPrILULaUn2nWecFrn1k2I+99HpoyvcOGEbtcOxpDiUwPF2ZANMJDh32qwOUPenuR1g==",
           "requires": {
-            "abbrev": "1"
-          }
-        },
-        "npmlog": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
-          "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
-          "requires": {
-            "are-we-there-yet": "^2.0.0",
-            "console-control-strings": "^1.1.0",
-            "gauge": "^3.0.0",
-            "set-blocking": "^2.0.0"
+            "detect-libc": "^1.0.2",
+            "mkdirp": "^0.5.3",
+            "needle": "^2.5.0",
+            "nopt": "^4.0.1",
+            "npm-packlist": "^1.1.6",
+            "npmlog": "^4.0.2",
+            "rc": "^1.2.7",
+            "rimraf": "^2.6.1",
+            "semver": "^5.3.0",
+            "tar": "^4.4.2"
           }
         },
         "p-limit": {
@@ -30123,81 +29871,38 @@
           "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz",
           "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA=="
         },
-        "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+        "protobufjs": {
+          "version": "6.10.2",
+          "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.10.2.tgz",
+          "integrity": "sha512-27yj+04uF6ya9l+qfpH187aqEzfCF4+Uit0I9ZBQVqK09hk/SQzKa2MUqUpXaVa7LOFRg1TSSr3lVxGOk6c0SQ==",
           "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
+            "@protobufjs/aspromise": "^1.1.2",
+            "@protobufjs/base64": "^1.1.2",
+            "@protobufjs/codegen": "^2.0.4",
+            "@protobufjs/eventemitter": "^1.1.0",
+            "@protobufjs/fetch": "^1.1.0",
+            "@protobufjs/float": "^1.0.2",
+            "@protobufjs/inquire": "^1.1.0",
+            "@protobufjs/path": "^1.1.2",
+            "@protobufjs/pool": "^1.1.0",
+            "@protobufjs/utf8": "^1.1.0",
+            "@types/long": "^4.0.1",
+            "@types/node": "^13.7.0",
+            "long": "^4.0.0"
           }
         },
         "rimraf": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
           "requires": {
             "glob": "^7.1.3"
           }
         },
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-        },
-        "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
         "source-map": {
           "version": "0.7.3",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
           "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
-        },
-        "string_decoder": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-          "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-          "requires": {
-            "safe-buffer": "~5.2.0"
-          }
-        },
-        "tar": {
-          "version": "6.1.11",
-          "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
-          "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
-          "requires": {
-            "chownr": "^2.0.0",
-            "fs-minipass": "^2.0.0",
-            "minipass": "^3.0.0",
-            "minizlib": "^2.1.1",
-            "mkdirp": "^1.0.3",
-            "yallist": "^4.0.0"
-          }
-        },
-        "tr46": {
-          "version": "0.0.3",
-          "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-          "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
-        },
-        "webidl-conversions": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-          "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
-        },
-        "whatwg-url": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-          "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
-          "requires": {
-            "tr46": "~0.0.3",
-            "webidl-conversions": "^3.0.0"
-          }
         }
       }
     },
@@ -32784,6 +32489,16 @@
         "debug": "^4.1.1",
         "module-details-from-path": "^1.0.3",
         "resolve": "^1.12.0"
+      },
+      "dependencies": {
+        "has": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+          "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+          "requires": {
+            "function-bind": "^1.1.1"
+          }
+        }
       }
     },
     "require-like": {
@@ -36395,7 +36110,7 @@
     "timed-out": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
-      "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8="
+      "integrity": "sha512-G7r3AhovYtr5YKOWQkta8RKAPb+J9IsO4uVmzjl8AZwfhs8UcUwTiD6gcJYSgOtzyjvQKrKYn41syHbUWMkafA=="
     },
     "timekeeper": {
       "version": "2.2.0",
diff --git a/services/web/package.json b/services/web/package.json
index 7c7ea23fcd..e64bcc6146 100644
--- a/services/web/package.json
+++ b/services/web/package.json
@@ -47,8 +47,7 @@
     "@babel/core": "^7.14.5",
     "@babel/preset-env": "^7.14.5",
     "@babel/preset-react": "^7.14.5",
-    "@overleaf/logger": "^3.0.0",
-    "@overleaf/metrics": "^4.0.0",
+    "@overleaf/metrics": "^3.5.1",
     "@overleaf/o-error": "^3.3.1",
     "@overleaf/object-persistor": "^1.0.1",
     "@overleaf/redis-wrapper": "^2.0.0",
@@ -114,6 +113,7 @@
     "jsonwebtoken": "^8.5.1",
     "ldapjs": "^0.7.1",
     "lodash": "^4.17.19",
+    "logger-sharelatex": "^2.2.0",
     "lru-cache": "^6.0.0",
     "mailchimp-api-v3": "^1.12.0",
     "marked": "^0.3.5",
diff --git a/services/web/scripts/ensure_affiliations.js b/services/web/scripts/ensure_affiliations.js
index 47fdb0821d..746ae2c438 100644
--- a/services/web/scripts/ensure_affiliations.js
+++ b/services/web/scripts/ensure_affiliations.js
@@ -1,7 +1,7 @@
 const { waitForDb } = require('../app/src/infrastructure/mongodb')
 const { User } = require('../app/src/models/User')
 const UserController = require('../app/src/Features/User/UserController')
-require('@overleaf/logger').logger.level('error')
+require('logger-sharelatex').logger.level('error')
 const pLimit = require('p-limit')
 const CONCURRENCY = 10
 const failure = []
diff --git a/services/web/test/acceptance/src/BackFillDeletedFilesTests.js b/services/web/test/acceptance/src/BackFillDeletedFilesTests.js
index 5e9a0927d8..13b96299f0 100644
--- a/services/web/test/acceptance/src/BackFillDeletedFilesTests.js
+++ b/services/web/test/acceptance/src/BackFillDeletedFilesTests.js
@@ -1,7 +1,7 @@
 const { exec } = require('child_process')
 const { promisify } = require('util')
 const { expect } = require('chai')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const { db, ObjectId } = require('../../../app/src/infrastructure/mongodb')
 const User = require('./helpers/User').promises
 
diff --git a/services/web/test/acceptance/src/BackFillDocNameForDeletedDocsTests.js b/services/web/test/acceptance/src/BackFillDocNameForDeletedDocsTests.js
index cdc2194aa7..036ac9a568 100644
--- a/services/web/test/acceptance/src/BackFillDocNameForDeletedDocsTests.js
+++ b/services/web/test/acceptance/src/BackFillDocNameForDeletedDocsTests.js
@@ -1,7 +1,7 @@
 const { exec } = require('child_process')
 const { promisify } = require('util')
 const { expect } = require('chai')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const { db, ObjectId } = require('../../../app/src/infrastructure/mongodb')
 const User = require('./helpers/User').promises
 
diff --git a/services/web/test/acceptance/src/BackFillDummyDocMetaTests.js b/services/web/test/acceptance/src/BackFillDummyDocMetaTests.js
index 7935314233..17b6727dbf 100644
--- a/services/web/test/acceptance/src/BackFillDummyDocMetaTests.js
+++ b/services/web/test/acceptance/src/BackFillDummyDocMetaTests.js
@@ -1,7 +1,7 @@
 const { exec } = require('child_process')
 const { promisify } = require('util')
 const { expect } = require('chai')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const { filterOutput } = require('./helpers/settings')
 const { db, ObjectId } = require('../../../app/src/infrastructure/mongodb')
 
diff --git a/services/web/test/acceptance/src/DeleteOrphanedDocsOnlineCheckTests.js b/services/web/test/acceptance/src/DeleteOrphanedDocsOnlineCheckTests.js
index 05db8e066e..22afed51d4 100644
--- a/services/web/test/acceptance/src/DeleteOrphanedDocsOnlineCheckTests.js
+++ b/services/web/test/acceptance/src/DeleteOrphanedDocsOnlineCheckTests.js
@@ -1,7 +1,7 @@
 const { exec } = require('child_process')
 const { promisify } = require('util')
 const { expect } = require('chai')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const { filterOutput } = require('./helpers/settings')
 const { db, ObjectId } = require('../../../app/src/infrastructure/mongodb')
 
diff --git a/services/web/test/acceptance/src/RegenerateDuplicateReferralIdsTests.js b/services/web/test/acceptance/src/RegenerateDuplicateReferralIdsTests.js
index 8ffdaab14e..c612c9c2cb 100644
--- a/services/web/test/acceptance/src/RegenerateDuplicateReferralIdsTests.js
+++ b/services/web/test/acceptance/src/RegenerateDuplicateReferralIdsTests.js
@@ -1,7 +1,7 @@
 const { exec } = require('child_process')
 const { promisify } = require('util')
 const { expect } = require('chai')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const { filterOutput } = require('./helpers/settings')
 const { db } = require('../../../app/src/infrastructure/mongodb')
 
@@ -91,7 +91,7 @@ describe('RegenerateDuplicateReferralIds', function () {
           `BATCH_SIZE=${BATCH_SIZE}`,
           // log details on duplicate matching
           'VERBOSE_LOGGING=true',
-          // disable verbose logging
+          // disable verbose logging from logger-sharelatex
           'LOG_LEVEL=ERROR',
 
           // actual command
diff --git a/services/web/test/acceptance/src/helpers/InitApp.js b/services/web/test/acceptance/src/helpers/InitApp.js
index fad6de67e6..d9cfa65621 100644
--- a/services/web/test/acceptance/src/helpers/InitApp.js
+++ b/services/web/test/acceptance/src/helpers/InitApp.js
@@ -2,7 +2,7 @@ const App = require('../../../../app.js')
 const QueueWorkers = require('../../../../app/src/infrastructure/QueueWorkers')
 const MongoHelper = require('./MongoHelper')
 const RedisHelper = require('./RedisHelper')
-const { logger } = require('@overleaf/logger')
+const { logger } = require('logger-sharelatex')
 
 logger.level('error')
 
diff --git a/services/web/test/acceptance/src/helpers/redis.js b/services/web/test/acceptance/src/helpers/redis.js
index d45a476e45..b954ccce81 100644
--- a/services/web/test/acceptance/src/helpers/redis.js
+++ b/services/web/test/acceptance/src/helpers/redis.js
@@ -12,7 +12,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 const Settings = require('@overleaf/settings')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const Async = require('async')
 
 const UserSessionsRedis = require('../../../../app/src/Features/User/UserSessionsRedis')
diff --git a/services/web/test/unit/bootstrap.js b/services/web/test/unit/bootstrap.js
index 3d5328a8d8..132f3ff2ad 100644
--- a/services/web/test/unit/bootstrap.js
+++ b/services/web/test/unit/bootstrap.js
@@ -50,7 +50,7 @@ SandboxedModule.configure({
 
 function getSandboxedModuleRequires() {
   const requires = {
-    '@overleaf/logger': globalStubs.logger,
+    'logger-sharelatex': globalStubs.logger,
   }
 
   const internalModules = [
diff --git a/services/web/test/unit/src/Subscription/RecurlyClientTests.js b/services/web/test/unit/src/Subscription/RecurlyClientTests.js
index 726c545892..f42a2a8bb1 100644
--- a/services/web/test/unit/src/Subscription/RecurlyClientTests.js
+++ b/services/web/test/unit/src/Subscription/RecurlyClientTests.js
@@ -64,7 +64,7 @@ describe('RecurlyClient', function () {
       requires: {
         '@overleaf/settings': this.settings,
         recurly: this.recurly,
-        '@overleaf/logger': {
+        'logger-sharelatex': {
           err: sinon.stub(),
           error: sinon.stub(),
           warn: sinon.stub(),