diff --git a/orca-bakery/src/main/groovy/com/netflix/spinnaker/orca/bakery/BakerySelector.java b/orca-bakery/src/main/groovy/com/netflix/spinnaker/orca/bakery/BakerySelector.java
index c9e67e1a1b..b70e52d9cb 100644
--- a/orca-bakery/src/main/groovy/com/netflix/spinnaker/orca/bakery/BakerySelector.java
+++ b/orca-bakery/src/main/groovy/com/netflix/spinnaker/orca/bakery/BakerySelector.java
@@ -130,7 +130,7 @@ interface SelectableFields {
 
     // Allows to shard the bakery based on common bake stage fields
     List<String> contextFields =
-        Arrays.asList("cloudProvider", "region", "baseOS", "cloudProviderType");
+        Arrays.asList("cloudProvider", "region", "baseOs", "cloudProviderType");
   }
 
   interface ConfigFields {
diff --git a/orca-bakery/src/test/groovy/com/netflix/spinnaker/orca/bakery/BakerySelectorSpec.groovy b/orca-bakery/src/test/groovy/com/netflix/spinnaker/orca/bakery/BakerySelectorSpec.groovy
index b6eddb8888..7a566c5af4 100644
--- a/orca-bakery/src/test/groovy/com/netflix/spinnaker/orca/bakery/BakerySelectorSpec.groovy
+++ b/orca-bakery/src/test/groovy/com/netflix/spinnaker/orca/bakery/BakerySelectorSpec.groovy
@@ -47,6 +47,7 @@ class BakerySelectorSpec extends Specification {
         config: [:],
         parameters: [
           new Parameter(name: "region", values: ["us-east-1"]),
+          new Parameter(name: "baseOs", values: ["centos"]),
           new Parameter(name: "cloudProviderType", values: ["aws"])
         ]
       ),
@@ -97,7 +98,7 @@ class BakerySelectorSpec extends Specification {
     where:
     ctx                                       | user               || service
     [region: "us-east-1"]                     | "user@netflix.com" || new TestBakeryService(url: "http://bakery.com")
-    [region: "us-east-1", cloudProviderType: "aws", selectBakery: true] | "user@netflix.com" || new TestBakeryService(url: "http://rosco.us-east-1.com")
+    [region: "us-east-1", cloudProviderType: "aws", selectBakery: true, baseOs: "centos"] | "user@netflix.com" || new TestBakeryService(url: "http://rosco.us-east-1.com")
     [region: "eu-west-1", selectBakery: true] | "test@netflix.com" || new TestBakeryService(url: "http://bakery.com")
     [selectBakery: true]                      | "bob@netflix.com"  || new TestBakeryService(url: "http://rosco.eu-west-1.com")
     [selectBakery: false]                     | "bob@netflix.com"  || new TestBakeryService(url: "http://bakery.com")