diff --git a/pkg/promotion/promotion.go b/pkg/promotion/promotion.go
index 96e618e0357..3ccf7107ffd 100644
--- a/pkg/promotion/promotion.go
+++ b/pkg/promotion/promotion.go
@@ -130,12 +130,13 @@ func (o *Options) Bind(fs *flag.FlagSet) {
 	fs.StringVar(&o.Repo, "repo", "", "Limit repos affected to this repo.")
 }
 
+var masterBranches = regexp.MustCompile(`^master.*$`)
 var threeXBranches = regexp.MustCompile(`^(release|enterprise|openshift)-3\.[0-9]+$`)
 var fourXBranches = regexp.MustCompile(`^(release|enterprise|openshift)-(4\.[0-9]+)$`)
 
 func FlavorForBranch(branch string) string {
 	var flavor string
-	if branch == "master" {
+	if masterBranches.MatchString(branch) {
 		flavor = "master"
 	} else if threeXBranches.MatchString(branch) {
 		flavor = "3.x"
diff --git a/pkg/promotion/promotion_test.go b/pkg/promotion/promotion_test.go
index 39f6d356970..8b530491b15 100644
--- a/pkg/promotion/promotion_test.go
+++ b/pkg/promotion/promotion_test.go
@@ -130,6 +130,16 @@ func TestFlavorForBranch(t *testing.T) {
 			branch:   "master",
 			expected: "master",
 		},
+		{
+			name:     "master-fcos branch goes to master configmap",
+			branch:   "master-fcos",
+			expected: "master",
+		},
+		{
+			name:     "branch containing master goes to misc configmap",
+			branch:   "not-really-master-branch",
+			expected: "misc",
+		},
 		{
 			name:     "enterprise 3.6 branch goes to 3.x configmap",
 			branch:   "enterprise-3.6",
diff --git a/test/prowgen-integration/data/input/jobs/super/duper/super-duper-master-removed-ciop-config-postsubmits.yaml b/test/prowgen-integration/data/input/jobs/super/duper/super-duper-master-removed-ciop-config-postsubmits.yaml
index b59e9e3b981..5296546aef5 100644
--- a/test/prowgen-integration/data/input/jobs/super/duper/super-duper-master-removed-ciop-config-postsubmits.yaml
+++ b/test/prowgen-integration/data/input/jobs/super/duper/super-duper-master-removed-ciop-config-postsubmits.yaml
@@ -26,7 +26,7 @@ postsubmits:
           valueFrom:
             configMapKeyRef:
               key: super-duper-master-removed-promotion.yaml
-              name: ci-operator-misc-configs
+              name: ci-operator-master-configs
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""
diff --git a/test/prowgen-integration/data/input/jobs/super/duper/super-duper-master-removed-promotion-postsubmits.yaml b/test/prowgen-integration/data/input/jobs/super/duper/super-duper-master-removed-promotion-postsubmits.yaml
index a95f94625b8..071b37758b5 100644
--- a/test/prowgen-integration/data/input/jobs/super/duper/super-duper-master-removed-promotion-postsubmits.yaml
+++ b/test/prowgen-integration/data/input/jobs/super/duper/super-duper-master-removed-promotion-postsubmits.yaml
@@ -24,7 +24,7 @@ postsubmits:
           valueFrom:
             configMapKeyRef:
               key: super-duper-master-removed-promotion.yaml
-              name: ci-operator-misc-configs
+              name: ci-operator-master-configs
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""
diff --git a/test/prowgen-integration/data/input/jobs/super/duper/super-duper-master-removed-promotion-presubmits.yaml b/test/prowgen-integration/data/input/jobs/super/duper/super-duper-master-removed-promotion-presubmits.yaml
index d8783c3eead..4e30308ac05 100644
--- a/test/prowgen-integration/data/input/jobs/super/duper/super-duper-master-removed-promotion-presubmits.yaml
+++ b/test/prowgen-integration/data/input/jobs/super/duper/super-duper-master-removed-promotion-presubmits.yaml
@@ -27,7 +27,7 @@ presubmits:
           valueFrom:
             configMapKeyRef:
               key: super-duper-master-removed-promotion.yaml
-              name: ci-operator-misc-configs
+              name: ci-operator-master-configs
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""
diff --git a/test/prowgen-integration/data/output/jobs/super/duper/super-duper-master-removed-promotion-presubmits.yaml b/test/prowgen-integration/data/output/jobs/super/duper/super-duper-master-removed-promotion-presubmits.yaml
index 0d9028183cd..a6c700d6abd 100644
--- a/test/prowgen-integration/data/output/jobs/super/duper/super-duper-master-removed-promotion-presubmits.yaml
+++ b/test/prowgen-integration/data/output/jobs/super/duper/super-duper-master-removed-promotion-presubmits.yaml
@@ -31,7 +31,7 @@ presubmits:
           valueFrom:
             configMapKeyRef:
               key: super-duper-master-removed-promotion.yaml
-              name: ci-operator-misc-configs
+              name: ci-operator-master-configs
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""