diff --git a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/BakeService.groovy b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/BakeService.groovy
index af758f69c9..e245d057f6 100644
--- a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/BakeService.groovy
+++ b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/BakeService.groovy
@@ -32,9 +32,12 @@ class BakeService {
 
   // Default bake options from configuration.
   List<BakeOptions> bakeOptions
+  // If set, use bake options defined in gate.yml instead of calling rosco
+  boolean useDefaultBakeOptions
 
   def bakeOptions() {
-    roscoServiceSelector ? roscoServiceSelector.withLocation().bakeOptions() : bakeOptions
+    (roscoServiceSelector && !useDefaultBakeOptions) ?
+      roscoServiceSelector.withLocation().bakeOptions() : bakeOptions
   }
 
   def bakeOptions(String cloudProvider) {