diff --git a/build/commands/lib/config.js b/build/commands/lib/config.js
index ab03382d607..9c198f70d94 100755
--- a/build/commands/lib/config.js
+++ b/build/commands/lib/config.js
@@ -152,6 +152,7 @@ const Config = function () {
   this.gomaServerHost = getNPMConfig(['goma_server_host'])
   // os.cpus().length is number of threads not physical cores
   this.gomaJValue = Math.min(40, os.cpus().length * 2)
+  this.isCI = process.env.BUILD_ID !== undefined
   this.braveStatsApiKey = getNPMConfig(['brave_stats_api_key']) || ''
   this.braveStatsUpdaterUrl = getNPMConfig(['brave_stats_updater_url']) || ''
   this.ignore_compile_failure = false
@@ -303,6 +304,16 @@ Config.prototype.buildArgs = function () {
 
   if (!this.isBraveReleaseBuild()) {
     args.chrome_pgo_phase = 0
+
+    if (process.platform === 'darwin' && this.targetOS != 'ios' && args.is_official_build) {
+      // Currently we're using is_official_build mode in PR builds on CI. This enables dSYMs
+      // by default, which slows down link phase, but also disables relocatable compilation
+      // on MacOS (aka 'zero goma cachehits' style).
+      //
+      // Don't create dSYMs in non-public Release builds.
+      // See //build/config/apple/symbols.gni for additional details.
+      args.enable_dsyms = false
+    }
   }
 
   if (this.shouldSign()) {
@@ -631,6 +642,16 @@ Config.prototype.update = function (options) {
 
   if (options.use_goma) {
     this.use_goma = true
+    if (process.env.GOMA_DIR !== undefined) {
+      this.gomaDir = process.env.GOMA_DIR
+    } else {
+      const build_goma_dir = path.join(this.srcDir, 'build', 'goma')
+      if (fs.existsSync(build_goma_dir)) {
+        this.gomaDir = build_goma_dir
+      } else {
+        this.gomaDir = path.join(this.depotToolsDir, '.cipd_bin')
+      }
+    }
   } else {
     this.use_goma = false
   }
@@ -891,7 +912,7 @@ Object.defineProperty(Config.prototype, 'defaultOptions', {
     }
 
     if (this.use_goma && this.gomaServerHost) {
-      env.CC_WRAPPER = path.join(this.depotToolsDir, '.cipd_bin', 'gomacc')
+      env.CC_WRAPPER = path.join(this.gomaDir, 'gomacc')
       env.GOMA_SERVER_HOST = this.gomaServerHost
       // env.NINJA_REMOTE_NUM_JOBS = this.gomaJValue
       // console.log('ninja remote jobs number is ' + env.NINJA_REMOTE_NUM_JOBS)
diff --git a/build/commands/lib/util.js b/build/commands/lib/util.js
index 042cde3e36f..f32e9861772 100755
--- a/build/commands/lib/util.js
+++ b/build/commands/lib/util.js
@@ -6,6 +6,7 @@ const fs = require('fs-extra')
 const crypto = require('crypto')
 const l10nUtil = require('./l10nUtil')
 const Log = require('./sync/logging')
+const assert = require('assert')
 
 const runGClient = (args, options = {}) => {
   if (config.gClientVerbose) args.push('--verbose')
@@ -578,16 +579,24 @@ const util = {
     ]
 
     if (config.use_goma) {
+      const compiler_proxy_binary = path.join(config.gomaDir, util.appendExeIfWin32('compiler_proxy'))
+      assert(fs.existsSync(compiler_proxy_binary), 'compiler_proxy not found at ' + config.gomaDir)
+      options.env.GOMA_COMPILER_PROXY_BINARY = compiler_proxy_binary
       const gomaLoginInfo = util.runProcess('goma_auth', ['info'], options)
       if (gomaLoginInfo.status !== 0) {
         console.log('Login required for using Goma. This is only needed once')
         util.run('goma_auth', ['login'], options)
       }
       util.run('goma_ctl', ['ensure_start'], options)
+      util.run('goma_ctl', ['update_hook'], options)
       ninjaOpts.push('-j', config.gomaJValue)
     }
 
     util.run('autoninja', ninjaOpts, options)
+
+    if (config.isCI && config.use_goma) {
+      util.run('goma_ctl', ['stat'], options)
+    }
   },
 
   generateXcodeWorkspace: (options = config.defaultOptions) => {
@@ -754,6 +763,12 @@ const util = {
       }
     })
     return filelist
+  },
+
+  appendExeIfWin32: (input) => {
+    if (process.platform === 'win32')
+      input += '.exe'
+    return input
   }
 }