diff --git a/api/controller/controller_util.py b/api/controller/controller_util.py
index df045bc..ec46ebf 100644
--- a/api/controller/controller_util.py
+++ b/api/controller/controller_util.py
@@ -73,10 +73,10 @@
   if goma_message.goma_approach == common_pb2.GomaConfig.RBE_STAGING:
     goma_approach = goma_util.GomaApproach('?staging',
                                            'staging-goma.chromium.org', True)
-  elif goma_message.goma_approach == common_pb2.GomaConfig.RBE_CHROMEOS:
-    goma_approach = goma_util.GomaApproach('?cros', 'goma.chromium.org', True)
-  else:
+  elif goma_message.goma_approach == common_pb2.GomaConfig.RBE_PROD:
     goma_approach = goma_util.GomaApproach('?prod', 'goma.chromium.org', True)
+  else:
+    goma_approach = goma_util.GomaApproach('?cros', 'goma.chromium.org', True)
 
   # Note that we are not specifying the goma log_dir so that goma will create
   # and use a tmp dir for the logs.