diff --git a/api/controller/controller_util.py b/api/controller/controller_util.py
index fa22fbf..630be1f 100644
--- a/api/controller/controller_util.py
+++ b/api/controller/controller_util.py
@@ -9,6 +9,7 @@
 
 from chromite.api.gen.chromiumos import common_pb2
 
+from chromite.cbuildbot import goma_util
 from chromite.lib import portage_util
 from chromite.lib.build_target_util import BuildTarget
 from chromite.lib.chroot_lib import Chroot
@@ -56,8 +57,14 @@
   if features:
     env['FEATURES'] = ' '.join(features)
 
+  goma = None
+  if chroot_message.goma.goma_dir:
+    goma = goma_util.Goma(chroot_message.goma.goma_dir,
+                          chroot_message.goma.goma_client_json,
+                          stage_name='BuildAPI')
+
   return Chroot(path=path, cache_dir=cache_dir, chrome_root=chrome_root,
-                env=env)
+                env=env, goma=goma)
 
 
 def ParseBuildTarget(build_target_message):