diff --git a/core-services/prow/02_config/_config.yaml b/core-services/prow/02_config/_config.yaml
index f095c4ed669a5..620f971e6b391 100644
--- a/core-services/prow/02_config/_config.yaml
+++ b/core-services/prow/02_config/_config.yaml
@@ -1006,7 +1006,6 @@ tide:
     - openshift-priv/baremetal-operator
     - openshift-priv/baremetal-runtimecfg
     - openshift-priv/builder
-    - openshift-priv/cincinnati-operator
     - openshift-priv/client-go
     - openshift-priv/cloud-credential-operator
     - openshift-priv/cloud-network-config-controller
@@ -1169,8 +1168,6 @@ tide:
     - openshift/baremetal-operator
     - openshift/baremetal-runtimecfg
     - openshift/builder
-    - openshift/cincinnati
-    - openshift/cincinnati-operator
     - openshift/client-go
     - openshift/cloud-credential-operator
     - openshift/cloud-network-config-controller
@@ -1361,7 +1358,6 @@ tide:
     - openshift-priv/baremetal-operator
     - openshift-priv/baremetal-runtimecfg
     - openshift-priv/builder
-    - openshift-priv/cincinnati-operator
     - openshift-priv/client-go
     - openshift-priv/cloud-credential-operator
     - openshift-priv/cloud-network-config-controller
@@ -1524,8 +1520,6 @@ tide:
     - openshift/baremetal-operator
     - openshift/baremetal-runtimecfg
     - openshift/builder
-    - openshift/cincinnati
-    - openshift/cincinnati-operator
     - openshift/client-go
     - openshift/cloud-credential-operator
     - openshift/cloud-network-config-controller
@@ -1682,7 +1676,9 @@ tide:
     - operator-framework/operator-lifecycle-manager
     - operator-framework/operator-marketplace
     - operator-framework/operator-registry
-  - excludedBranches:
+  - includedBranches:
+    - community-4.6
+    - community-4.7
     - release-3.11
     - release-4.0
     - release-4.1
@@ -1692,7 +1688,6 @@ tide:
     - release-4.5
     - release-4.6
     - release-4.7
-    - release-4.8
     - openshift-4.1
     - openshift-4.2
     - openshift-4.3
@@ -1700,14 +1695,11 @@ tide:
     - openshift-4.5
     - openshift-4.6
     - openshift-4.7
-    - openshift-4.8
-    - feature-es6x
-    - feature-prom-connector
-    - master
-    - main
     labels:
     - lgtm
     - approved
+    - bugzilla/valid-bug
+    - cherry-pick-approved
     missingLabels:
     - needs-rebase
     - do-not-merge/hold
@@ -1734,7 +1726,6 @@ tide:
     - openshift-priv/baremetal-operator
     - openshift-priv/baremetal-runtimecfg
     - openshift-priv/builder
-    - openshift-priv/cincinnati-operator
     - openshift-priv/client-go
     - openshift-priv/cloud-credential-operator
     - openshift-priv/cloud-network-config-controller
@@ -1824,6 +1815,7 @@ tide:
     - openshift-priv/kube-rbac-proxy
     - openshift-priv/kube-state-metrics
     - openshift-priv/kubecsr
+    - openshift-priv/kubernetes
     - openshift-priv/kubernetes-autoscaler
     - openshift-priv/kubernetes-kube-storage-version-migrator
     - openshift-priv/kuryr-kubernetes
@@ -1852,6 +1844,7 @@ tide:
     - openshift-priv/openshift-tuned
     - openshift-priv/openstack-cinder-csi-driver-operator
     - openshift-priv/operator-framework-olm
+    - openshift-priv/origin
     - openshift-priv/origin-aggregated-logging
     - openshift-priv/ovirt-csi-driver
     - openshift-priv/ovirt-csi-driver-operator
@@ -1891,8 +1884,6 @@ tide:
     - openshift/baremetal-operator
     - openshift/baremetal-runtimecfg
     - openshift/builder
-    - openshift/cincinnati
-    - openshift/cincinnati-operator
     - openshift/client-go
     - openshift/cloud-credential-operator
     - openshift/cloud-network-config-controller
@@ -1984,6 +1975,7 @@ tide:
     - openshift/kube-rbac-proxy
     - openshift/kube-state-metrics
     - openshift/kubecsr
+    - openshift/kubernetes
     - openshift/kubernetes-autoscaler
     - openshift/kubernetes-kube-storage-version-migrator
     - openshift/kuryr-kubernetes
@@ -2012,6 +2004,7 @@ tide:
     - openshift/openshift-tuned
     - openshift/openstack-cinder-csi-driver-operator
     - openshift/operator-framework-olm
+    - openshift/origin
     - openshift/origin-aggregated-logging
     - openshift/ovirt-csi-driver
     - openshift/ovirt-csi-driver-operator
@@ -2043,9 +2036,7 @@ tide:
     - operator-framework/operator-lifecycle-manager
     - operator-framework/operator-marketplace
     - operator-framework/operator-registry
-  - includedBranches:
-    - community-4.6
-    - community-4.7
+  - excludedBranches:
     - release-3.11
     - release-4.0
     - release-4.1
@@ -2055,6 +2046,7 @@ tide:
     - release-4.5
     - release-4.6
     - release-4.7
+    - release-4.8
     - openshift-4.1
     - openshift-4.2
     - openshift-4.3
@@ -2062,11 +2054,14 @@ tide:
     - openshift-4.5
     - openshift-4.6
     - openshift-4.7
+    - openshift-4.8
+    - feature-es6x
+    - feature-prom-connector
+    - master
+    - main
     labels:
     - lgtm
     - approved
-    - bugzilla/valid-bug
-    - cherry-pick-approved
     missingLabels:
     - needs-rebase
     - do-not-merge/hold
@@ -2182,7 +2177,6 @@ tide:
     - openshift-priv/kube-rbac-proxy
     - openshift-priv/kube-state-metrics
     - openshift-priv/kubecsr
-    - openshift-priv/kubernetes
     - openshift-priv/kubernetes-autoscaler
     - openshift-priv/kubernetes-kube-storage-version-migrator
     - openshift-priv/kuryr-kubernetes
@@ -2211,7 +2205,6 @@ tide:
     - openshift-priv/openshift-tuned
     - openshift-priv/openstack-cinder-csi-driver-operator
     - openshift-priv/operator-framework-olm
-    - openshift-priv/origin
     - openshift-priv/origin-aggregated-logging
     - openshift-priv/ovirt-csi-driver
     - openshift-priv/ovirt-csi-driver-operator
@@ -2342,7 +2335,6 @@ tide:
     - openshift/kube-rbac-proxy
     - openshift/kube-state-metrics
     - openshift/kubecsr
-    - openshift/kubernetes
     - openshift/kubernetes-autoscaler
     - openshift/kubernetes-kube-storage-version-migrator
     - openshift/kuryr-kubernetes
@@ -2371,7 +2363,6 @@ tide:
     - openshift/openshift-tuned
     - openshift/openstack-cinder-csi-driver-operator
     - openshift/operator-framework-olm
-    - openshift/origin
     - openshift/origin-aggregated-logging
     - openshift/ovirt-csi-driver
     - openshift/ovirt-csi-driver-operator
@@ -2426,6 +2417,7 @@ tide:
     - openshift-kni/performance-addon-operators
     - openshift-kni/poison-pill
     - openshift-priv/build-machinery-go
+    - openshift-priv/cincinnati-operator
     - openshift-priv/kubernetes-nmstate
     - openshift-priv/library-go
     - openshift-priv/openshift-tests
@@ -2450,7 +2442,9 @@ tide:
     - openshift/ci-search
     - openshift/ci-tools
     - openshift/ci-vm-operator
+    - openshift/cincinnati
     - openshift/cincinnati-graph-data
+    - openshift/cincinnati-operator
     - openshift/cloud-ingress-operator
     - openshift/community
     - openshift/config