diff --git a/channels/candidate-4.6.yaml b/channels/candidate-4.6.yaml
index 3b2ecd611..31c617ae9 100644
--- a/channels/candidate-4.6.yaml
+++ b/channels/candidate-4.6.yaml
@@ -1,101 +1,59 @@
+feeder:
+  delay: PT0H
+  filter: 4\.[56]\.[0-9].*
+  name: candidate
 name: candidate-4.6
-tombstones:
-# Never got an errata
-- 4.5.0-0.hotfix-2020-11-28-021842
-# Shares an errata with a later release
-- 4.5.0
-- 4.5.25
-- 4.5.29
-- 4.5.32
-- 4.6.0
-- 4.6.2
-# Rerolling as 4.6.6 with a rebuilt CRI-O RPM
-- 4.6.5
-# Blocked on born-in-4.1 ingress regression: https://bugzilla.redhat.com/show_bug.cgi?id=1904582#c4
-- 4.6.7
-# Did not fix 4.6.9 OVS regression https://bugzilla.redhat.com/show_bug.cgi?id=1914284
-- 4.6.10
-# 4.6.24 introduced a regression in registry ca-trust handling: https://bugzilla.redhat.com/show_bug.cgi?id=1949040#c4
-- 4.6.24
-# Shares an errata with a later release
-- 4.6.33
-# 4.6.37 regressed on proxy handling https://bugzilla.redhat.com/show_bug.cgi?id=1978041
-- 4.6.37
-# 4.6.50 lacked some desired updates
-- 4.6.50
 versions:
-- 4.5.41
-
-- 4.5.40
-
-- 4.5.39
-
-- 4.5.38
-
-- 4.5.37
-
-- 4.5.36
-
-- 4.5.35
-
-- 4.5.34
-
-- 4.5.33
-
-- 4.5.32
-
-- 4.5.31
-
-- 4.5.30
-
-- 4.5.29
-
-- 4.5.28
-
-- 4.5.27
-
-- 4.5.25
-
-- 4.5.24
-
-- 4.5.23
-
-- 4.5.22
-
-- 4.5.0-0.hotfix-2020-11-28-021842
-
-- 4.5.21
-
-- 4.5.20
-
-- 4.5.19
-- 4.5.18
-- 4.5.17
-- 4.5.16
-- 4.5.15
-- 4.5.14
-- 4.5.13
-- 4.5.12
-- 4.5.11
-- 4.5.10
-- 4.5.9
-- 4.5.8
-- 4.5.7
-- 4.5.6
-- 4.5.5
-- 4.5.4
-- 4.5.3
-- 4.5.2
-- 4.5.1
-- 4.5.1-rc.0
 - 4.5.0
 - 4.5.0-0.hotfix-2020-08-24-185832
+- 4.5.0-0.hotfix-2020-11-28-021842
 - 4.5.0-rc.1
 - 4.5.0-rc.2
 - 4.5.0-rc.4
 - 4.5.0-rc.5
 - 4.5.0-rc.6
 - 4.5.0-rc.7
+- 4.5.1
+- 4.5.1-rc.0
+- 4.5.2
+- 4.5.3
+- 4.5.4
+- 4.5.5
+- 4.5.6
+- 4.5.7
+- 4.5.8
+- 4.5.9
+- 4.5.10
+- 4.5.11
+- 4.5.12
+- 4.5.13
+- 4.5.14
+- 4.5.15
+- 4.5.16
+- 4.5.17
+- 4.5.18
+- 4.5.19
+- 4.5.20
+- 4.5.21
+- 4.5.22
+- 4.5.23
+- 4.5.24
+- 4.5.25
+- 4.5.27
+- 4.5.28
+- 4.5.29
+- 4.5.30
+- 4.5.31
+- 4.5.32
+- 4.5.33
+- 4.5.34
+- 4.5.35
+- 4.5.36
+- 4.5.37
+- 4.5.38
+- 4.5.39
+- 4.5.40
+- 4.5.41
 - 4.6.0
 - 4.6.0-fc.0
 - 4.6.0-fc.1
@@ -114,95 +72,49 @@ versions:
 - 4.6.2
 - 4.6.3
 - 4.6.4
-
 - 4.6.5
-
 - 4.6.6
-
 - 4.6.7
-
 - 4.6.8
-
 - 4.6.9
-
 - 4.6.10
-
 - 4.6.12
-
 - 4.6.13
-
 - 4.6.15
-
 - 4.6.16
-
 - 4.6.17
-
 - 4.6.18
-
 - 4.6.19
-
 - 4.6.20
-
 - 4.6.21
-
 - 4.6.22
-
 - 4.6.23
-
 - 4.6.24
-
 - 4.6.25
-
 - 4.6.26
-
 - 4.6.27
-
 - 4.6.28
-
 - 4.6.29
-
 - 4.6.30
-
 - 4.6.31
-
 - 4.6.32
-
 - 4.6.33
-
 - 4.6.34
-
 - 4.6.35
-
 - 4.6.36
-
 - 4.6.37
-
 - 4.6.38
-
 - 4.6.39
-
 - 4.6.40
-
 - 4.6.41
-
 - 4.6.42
-
 - 4.6.43
-
 - 4.6.44
-
 - 4.6.45
-
 - 4.6.46
-
 - 4.6.47
-
 - 4.6.48
-
 - 4.6.49
-
 - 4.6.50
-
 - 4.6.51
-
 - 4.6.52
diff --git a/channels/candidate-4.7.yaml b/channels/candidate-4.7.yaml
index f3645ed33..d8f53d736 100644
--- a/channels/candidate-4.7.yaml
+++ b/channels/candidate-4.7.yaml
@@ -1,212 +1,114 @@
+feeder:
+  delay: PT0H
+  filter: 4\.[67]\.[0-9].*
+  name: candidate
 name: candidate-4.7
-tombstones:
-# Did not fix 4.6.9 OVS regression https://bugzilla.redhat.com/show_bug.cgi?id=1914284
+versions:
+- 4.6.0-fc.0
+- 4.6.0-fc.1
+- 4.6.0-fc.2
+- 4.6.0-fc.3
+- 4.6.0-fc.4
+- 4.6.0-fc.5
+- 4.6.0-fc.7
+- 4.6.0-fc.8
+- 4.6.0-rc.0
+- 4.6.0-rc.1
+- 4.6.0-rc.2
+- 4.6.0-rc.3
+- 4.6.0-rc.4
+- 4.6.1
+- 4.6.3
+- 4.6.4
+- 4.6.6
+- 4.6.8
+- 4.6.9
 - 4.6.10
-# 4.6.24 introduced a regression in registry ca-trust handling: https://bugzilla.redhat.com/show_bug.cgi?id=1949040#c4
+- 4.6.12
+- 4.6.13
+- 4.6.15
+- 4.6.16
+- 4.6.17
+- 4.6.18
+- 4.6.19
+- 4.6.20
+- 4.6.21
+- 4.6.22
+- 4.6.23
 - 4.6.24
-# Shares an errata with a later release
+- 4.6.25
+- 4.6.26
+- 4.6.27
+- 4.6.28
+- 4.6.29
+- 4.6.30
+- 4.6.31
+- 4.6.32
 - 4.6.33
-# 4.6.37 regressed on proxy handling https://bugzilla.redhat.com/show_bug.cgi?id=1978041
+- 4.6.34
+- 4.6.35
+- 4.6.36
 - 4.6.37
-# 4.6.50 lacked some desired updates
+- 4.6.38
+- 4.6.39
+- 4.6.40
+- 4.6.41
+- 4.6.42
+- 4.6.43
+- 4.6.44
+- 4.6.45
+- 4.6.46
+- 4.6.47
+- 4.6.48
+- 4.6.49
 - 4.6.50
-# 4.7.10 installer segfaults on install-config serviceEndpoints https://bugzilla.redhat.com/show_bug.cgi?id=1958420
-- 4.7.10
-# 4.7.14 moved monitoring to hard-anti-affinity, and that can conflict with volume affinity https://bugzilla.redhat.com/show_bug.cgi?id=1967614
-- 4.7.14
-# 4.7.15 OVN EgressFirewall doesn't work well as expected https://bugzilla.redhat.com/show_bug.cgi?id=1970322
-- 4.7.15
-# 4.7.17 MCO does not cordone nodes on upgrade https://bugzilla.redhat.com/show_bug.cgi?id=1973006
-- 4.7.17
-# 4.7.20 unspecified behavior change
-- 4.7.20
-# 4.7.25 has a CRI-O path issue for born-before-4.6 clusters: https://bugzilla.redhat.com/show_bug.cgi?id=1995785
-- 4.7.25
-# 4.7.26 has a networking issue with vSphere clusters running HW14 and later. SDN Packet loss resulting in service unavailability.  https://bugzilla.redhat.com/show_bug.cgi?id=1987108
-- 4.7.26
-# 4.7.35 lacks metadata errata URIs for s390x and ppc64le
-- 4.7.35
-versions:
-- 4.6.52
-
 - 4.6.51
-
-- 4.6.50
-
-- 4.6.49
-
-- 4.6.48
-
-- 4.6.47
-
-- 4.6.46
-
-- 4.6.45
-
-- 4.6.44
-
-- 4.6.43
-
-- 4.6.42
-
-- 4.6.41
-
-- 4.6.40
-
-- 4.6.39
-
-- 4.6.38
-
-- 4.6.37
-
-- 4.6.36
-
-- 4.6.35
-
-- 4.6.34
-
-- 4.6.33
-
-- 4.6.32
-
-- 4.6.31
-
-- 4.6.30
-
-- 4.6.29
-
-- 4.6.28
-
-- 4.6.27
-
-- 4.6.26
-
-- 4.6.25
-
-- 4.6.24
-
-- 4.6.23
-
-- 4.6.22
-
-- 4.6.21
-
-- 4.6.20
-
-- 4.6.19
-
-- 4.6.18
-
-- 4.6.17
-
-- 4.6.16
-
-- 4.6.15
-
-- 4.6.13
-
-- 4.6.12
-
-- 4.6.10
-
-- 4.6.9
-- 4.6.8
-- 4.6.6
-- 4.6.4
-- 4.6.3
-- 4.6.1
+- 4.6.52
+- 4.7.0
 - 4.7.0-fc.0
-
 - 4.7.0-fc.1
-
 - 4.7.0-fc.2
-
 - 4.7.0-fc.3
-
 - 4.7.0-fc.4
-
 - 4.7.0-fc.5
-
 - 4.7.0-rc.1
-
 - 4.7.0-rc.2
-
 - 4.7.0-rc.3
-
-- 4.7.0
-
 - 4.7.1
-
 - 4.7.2
-
 - 4.7.3
-
 - 4.7.4
-
 - 4.7.5
-
 - 4.7.6
-
 - 4.7.7
-
 - 4.7.8
-
 - 4.7.9
-
 - 4.7.10
-
 - 4.7.11
-
 - 4.7.12
-
 - 4.7.13
-
 - 4.7.14
-
 - 4.7.15
-
 - 4.7.16
-
 - 4.7.17
-
 - 4.7.18
-
 - 4.7.19
-
 - 4.7.20
-
 - 4.7.21
-
 - 4.7.22
-
 - 4.7.23
-
 - 4.7.24
-
 - 4.7.25
-
 - 4.7.26
-
 - 4.7.28
-
 - 4.7.29
-
 - 4.7.30
-
 - 4.7.31
-
 - 4.7.32
-
 - 4.7.33
-
 - 4.7.34
-
 - 4.7.35
-
 - 4.7.36
-
 - 4.7.37
-
 - 4.7.38
-
 - 4.7.39
diff --git a/channels/candidate-4.8.yaml b/channels/candidate-4.8.yaml
index 53f3dfeae..1fcab8426 100644
--- a/channels/candidate-4.8.yaml
+++ b/channels/candidate-4.8.yaml
@@ -1,170 +1,90 @@
+feeder:
+  delay: PT0H
+  filter: 4\.[78]\.[0-9].*
+  name: candidate
 name: candidate-4.8
-tombstones:
-# 4.7.10 installer segfaults on install-config serviceEndpoints https://bugzilla.redhat.com/show_bug.cgi?id=1958420
+versions:
+- 4.7.0
+- 4.7.0-fc.0
+- 4.7.0-fc.1
+- 4.7.0-fc.2
+- 4.7.0-fc.3
+- 4.7.0-fc.4
+- 4.7.0-fc.5
+- 4.7.0-rc.1
+- 4.7.0-rc.2
+- 4.7.0-rc.3
+- 4.7.1
+- 4.7.2
+- 4.7.3
+- 4.7.4
+- 4.7.5
+- 4.7.6
+- 4.7.7
+- 4.7.8
+- 4.7.9
 - 4.7.10
-# 4.7.14 moved monitoring to hard-anti-affinity, and that can conflict with volume affinity https://bugzilla.redhat.com/show_bug.cgi?id=1967614
+- 4.7.11
+- 4.7.12
+- 4.7.13
 - 4.7.14
-# 4.7.15 OVN EgressFirewall doesn't work well as expected https://bugzilla.redhat.com/show_bug.cgi?id=1970322
 - 4.7.15
-# 4.7.17 MCO does not cordone nodes on upgrade https://bugzilla.redhat.com/show_bug.cgi?id=1973006
+- 4.7.16
 - 4.7.17
-# 4.7.20 unspecified behavior change
+- 4.7.18
+- 4.7.19
 - 4.7.20
-# 4.7.25 has a CRI-O path issue for born-before-4.6 clusters: https://bugzilla.redhat.com/show_bug.cgi?id=1995785
+- 4.7.21
+- 4.7.22
+- 4.7.23
+- 4.7.24
 - 4.7.25
-# 4.7.26 has a networking issue with vSphere clusters running HW14 and later. SDN Packet loss resulting in service unavailability.  https://bugzilla.redhat.com/show_bug.cgi?id=1987108
 - 4.7.26
-# 4.7.35 lacks metadata errata URIs for s390x and ppc64le
+- 4.7.28
+- 4.7.29
+- 4.7.30
+- 4.7.31
+- 4.7.32
+- 4.7.33
+- 4.7.34
 - 4.7.35
-# 4.8.0 unspecified behavior change
-- 4.8.0
-# 4.8.1 s390x missed a kernel bump that went into the other platforms; rerolling as 4.8.2
-- 4.8.1
-# 4.8.6 has a CRI-O path issue for born-before-4.6 clusters: https://bugzilla.redhat.com/show_bug.cgi?id=1995785
-- 4.8.6
-# 4.8.7 has a networking issue with vSphere clusters running HW14 and later. SDN Packet loss resulting in service unavailability.  https://bugzilla.redhat.com/show_bug.cgi?id=1987108
-- 4.8.7
-# 4.8.16's amd64 build only has baked-in update edges from 4.7.35
-- 4.8.16
-versions:
-- 4.7.39
-
-- 4.7.38
-
-- 4.7.37
-
 - 4.7.36
-
-- 4.7.35
-
-- 4.7.34
-
-- 4.7.33
-
-- 4.7.32
-
-- 4.7.31
-
-- 4.7.30
-
-- 4.7.29
-
-- 4.7.28
-
-- 4.7.26
-
-- 4.7.25
-
-- 4.7.24
-
-- 4.7.23
-
-- 4.7.22
-
-- 4.7.21
-
-- 4.7.20
-
-- 4.7.19
-
-- 4.7.18
-
-- 4.7.17
-
-- 4.7.16
-
-- 4.7.15
-
-- 4.7.14
-
-- 4.7.13
-
-- 4.7.12
-
-- 4.7.11
-
-- 4.7.10
-
-- 4.7.9
-
-- 4.7.8
-
-- 4.7.7
-- 4.7.6
-- 4.7.5
-- 4.7.4
-- 4.7.3
-- 4.7.2
-- 4.7.1
-- 4.7.0
+- 4.7.37
+- 4.7.38
+- 4.7.39
+- 4.8.0
 - 4.8.0-fc.0
-
 - 4.8.0-fc.1
-
 - 4.8.0-fc.2
-
 - 4.8.0-fc.3
-
 - 4.8.0-fc.5
-
 - 4.8.0-fc.7
-
 - 4.8.0-fc.8
-
 - 4.8.0-fc.9
-
 - 4.8.0-rc.0
-
 - 4.8.0-rc.1
-
 - 4.8.0-rc.2
-
 - 4.8.0-rc.3
-
-- 4.8.0
-
 - 4.8.1
-
 - 4.8.2
-
 - 4.8.3
-
 - 4.8.4
-
 - 4.8.5
-
 - 4.8.6
-
 - 4.8.7
-
 - 4.8.9
-
 - 4.8.10
-
 - 4.8.11
-
 - 4.8.12
-
 - 4.8.13
-
 - 4.8.14
-
 - 4.8.15
-
 - 4.8.16
-
 - 4.8.17
-
 - 4.8.18
-
 - 4.8.19
-
 - 4.8.20
-
 - 4.8.21
-
 - 4.8.22
-
 - 4.8.23
-
 - 4.8.24
diff --git a/channels/candidate-4.9.yaml b/channels/candidate-4.9.yaml
index 90dbefb10..65bba87b8 100644
--- a/channels/candidate-4.9.yaml
+++ b/channels/candidate-4.9.yaml
@@ -1,87 +1,59 @@
+feeder:
+  delay: PT0H
+  filter: 4\.[89]\.[0-9].*
+  name: candidate
 name: candidate-4.9
-tombstones:
-# 4.8.7 has a networking issue with vSphere clusters running HW14 and later. SDN Packet loss resulting in service unavailability.  https://bugzilla.redhat.com/show_bug.cgi?id=1987108
+versions:
+- 4.8.0-fc.0
+- 4.8.0-fc.1
+- 4.8.0-fc.2
+- 4.8.0-fc.3
+- 4.8.0-fc.5
+- 4.8.0-fc.7
+- 4.8.0-fc.8
+- 4.8.0-fc.9
+- 4.8.0-rc.0
+- 4.8.0-rc.1
+- 4.8.0-rc.2
+- 4.8.0-rc.3
+- 4.8.2
+- 4.8.3
+- 4.8.4
+- 4.8.5
 - 4.8.7
-# 4.8.16's amd64 build only has baked-in update edges from 4.7.35
+- 4.8.9
+- 4.8.10
+- 4.8.11
+- 4.8.12
+- 4.8.13
+- 4.8.14
+- 4.8.15
 - 4.8.16
-# 4.9.1 lacked a baked-in update from 4.8.17
-- 4.9.1
-versions:
-- 4.8.24
-
-- 4.8.23
-
-- 4.8.22
-
-- 4.8.21
-
-- 4.8.20
-
-- 4.8.19
-
-- 4.8.18
-
 - 4.8.17
-
-- 4.8.16
-
-- 4.8.15
-
-- 4.8.14
-
-- 4.8.13
-
-- 4.8.12
-
-- 4.8.11
-
-- 4.8.10
-
-- 4.8.9
-
-- 4.8.7
-
-- 4.8.5
-- 4.8.4
-- 4.8.3
-- 4.8.2
-
+- 4.8.18
+- 4.8.19
+- 4.8.20
+- 4.8.21
+- 4.8.22
+- 4.8.23
+- 4.8.24
+- 4.9.0
 - 4.9.0-fc.0
-
 - 4.9.0-fc.1
-
 - 4.9.0-rc.0
-
 - 4.9.0-rc.1
-
 - 4.9.0-rc.3
-
 - 4.9.0-rc.4
-
 - 4.9.0-rc.5
-
 - 4.9.0-rc.6
-
 - 4.9.0-rc.7
-
 - 4.9.0-rc.8
-
-- 4.9.0
-
 - 4.9.1
-
 - 4.9.4
-
 - 4.9.5
-
 - 4.9.6
-
 - 4.9.7
-
 - 4.9.8
-
 - 4.9.9
-
 - 4.9.10
-
 - 4.9.11
diff --git a/channels/eus-4.6.yaml b/channels/eus-4.6.yaml
index dd820d649..771188f42 100644
--- a/channels/eus-4.6.yaml
+++ b/channels/eus-4.6.yaml
@@ -1,7 +1,7 @@
 feeder:
-  delay: P1W
-  filter: 4\.6\.[0-9]+(.*hotfix.*)?
-  name: fast-4.6
+  delay: PT0H
+  filter: 4\.6\.[0-9].*
+  name: stable
 name: eus-4.6
 versions:
 - 4.6.1
diff --git a/channels/eus-4.8.yaml b/channels/eus-4.8.yaml
index a1eafa895..511452f44 100644
--- a/channels/eus-4.8.yaml
+++ b/channels/eus-4.8.yaml
@@ -1,7 +1,7 @@
 feeder:
   delay: PT0H
   filter: 4\.[68]\.[0-9].*|4\.7\.(3[4-9]|[4-9][0-9])
-  name: stable-4.8
+  name: stable
 name: eus-4.8
 versions:
 - 4.6.1
diff --git a/channels/fast-4.6.yaml b/channels/fast-4.6.yaml
index cf2537b83..fcc51635e 100644
--- a/channels/fast-4.6.yaml
+++ b/channels/fast-4.6.yaml
@@ -1,7 +1,7 @@
 feeder:
-  errata: public
-  filter: 4\.[0-9]+\.[0-9]+(.*hotfix.*)?
-  name: candidate-4.6
+  delay: PT0H
+  filter: 4\.[56]\.[0-9].*
+  name: fast
 name: fast-4.6
 versions:
 - 4.5.0-0.hotfix-2020-08-24-185832
diff --git a/channels/fast-4.7.yaml b/channels/fast-4.7.yaml
index 8c777941a..5a96663c7 100644
--- a/channels/fast-4.7.yaml
+++ b/channels/fast-4.7.yaml
@@ -1,7 +1,7 @@
 feeder:
-  errata: public
-  filter: 4\.[0-9]+\.[0-9]+(.*hotfix.*)?
-  name: candidate-4.7
+  delay: PT0H
+  filter: 4\.[67]\.[0-9].*
+  name: fast
 name: fast-4.7
 versions:
 - 4.6.1
diff --git a/channels/fast-4.8.yaml b/channels/fast-4.8.yaml
index c121dcb47..273358752 100644
--- a/channels/fast-4.8.yaml
+++ b/channels/fast-4.8.yaml
@@ -1,7 +1,7 @@
 feeder:
-  errata: public
-  filter: 4\.[0-9]+\.[0-9]+(.*hotfix.*)?
-  name: candidate-4.8
+  delay: PT0H
+  filter: 4\.[78]\.[0-9].*
+  name: fast
 name: fast-4.8
 versions:
 - 4.7.0
diff --git a/channels/fast-4.9.yaml b/channels/fast-4.9.yaml
index 79c431004..715ca243f 100644
--- a/channels/fast-4.9.yaml
+++ b/channels/fast-4.9.yaml
@@ -1,7 +1,7 @@
 feeder:
-  errata: public
-  filter: 4\.[0-9]+\.[0-9]+(.*hotfix.*)?
-  name: candidate-4.9
+  delay: PT0H
+  filter: 4\.[89]\.[0-9].*
+  name: fast
 name: fast-4.9
 versions:
 - 4.8.2
diff --git a/channels/stable-4.7.yaml b/channels/stable-4.7.yaml
index 1b9d2e0f8..cecb82ff7 100644
--- a/channels/stable-4.7.yaml
+++ b/channels/stable-4.7.yaml
@@ -1,6 +1,7 @@
 feeder:
-  delay: P1W
-  name: fast-4.7
+  delay: PT0H
+  filter: 4\.[67]\.[0-9].*
+  name: stable
 name: stable-4.7
 versions:
 - 4.6.1
diff --git a/channels/stable-4.8.yaml b/channels/stable-4.8.yaml
index e86f449f9..3ca6f9245 100644
--- a/channels/stable-4.8.yaml
+++ b/channels/stable-4.8.yaml
@@ -1,6 +1,7 @@
 feeder:
-  delay: P1W
-  name: fast-4.8
+  delay: PT0H
+  filter: 4\.[78]\.[0-9].*
+  name: stable
 name: stable-4.8
 versions:
 - 4.7.0
diff --git a/channels/stable-4.9.yaml b/channels/stable-4.9.yaml
index 87407ae5e..e556e3597 100644
--- a/channels/stable-4.9.yaml
+++ b/channels/stable-4.9.yaml
@@ -1,7 +1,7 @@
 feeder:
-  delay: P1W
-  filter: 4\.9\.[0-9]+(.*hotfix.*)?
-  name: fast-4.9
+  delay: PT0H
+  filter: 4\.9\.[0-9].*
+  name: stable
 name: stable-4.9
 versions:
 - 4.9.0
diff --git a/hack/stabilization-changes.py b/hack/stabilization-changes.py
index b1fe2b9f5..156fc4ec1 100755
--- a/hack/stabilization-changes.py
+++ b/hack/stabilization-changes.py
@@ -40,8 +40,8 @@ def parse_iso8601_delay(delay):
     return datetime.timedelta(weeks=weeks, days=days, hours=hours)
 
 
-def stabilization_changes(directory, webhook=None, **kwargs):
-    channels, channel_paths = load_channels(directory=directory)
+def stabilization_changes(directories, webhook=None, **kwargs):
+    channels, channel_paths = load_channels(directories=directories)
     cache = {}
     notifications = []
     for name, channel in sorted(channels.items()):
@@ -141,24 +141,25 @@ def stabilize_release(version, channel_name, channel_path, delay, errata, feeder
                 public_errata_message)
 
 
-def load_channels(directory):
+def load_channels(directories):
     channels = {}
     paths = {}
-    for root, _, files in os.walk(directory):
-        for filename in files:
-            if not filename.endswith('.yaml'):
-                continue
-            path = os.path.join(root, filename)
-            with open(path) as f:
-                try:
-                    data = yaml.load(f, Loader=yaml.SafeLoader)
-                except ValueError as error:
-                    raise ValueError('failed to load YAML from {}: {}'.format(path, error))
-            channel = data['name']
-            if channel in channels:
-                raise ValueError('multiple definitions for {}: {} and {}'.format(channel, paths[channel], path))
-            paths[channel] = path
-            channels[channel] = data
+    for directory in directories:
+        for root, _, files in os.walk(directory):
+            for filename in files:
+                if not filename.endswith('.yaml'):
+                    continue
+                path = os.path.join(root, filename)
+                with open(path) as f:
+                    try:
+                        data = yaml.load(f, Loader=yaml.SafeLoader)
+                    except ValueError as error:
+                        raise ValueError('failed to load YAML from {}: {}'.format(path, error))
+                channel = data['name']
+                if channel in channels:
+                    raise ValueError('multiple definitions for {}: {} and {}'.format(channel, paths[channel], path))
+                paths[channel] = path
+                channels[channel] = data
     return channels, paths
 
 
@@ -201,6 +202,9 @@ def public_errata_uri(version, cache=None, **kwargs):
         if not cached:
             return None, None
         return cached['uri'], cached['public']
+    if kwargs.get('channel') == 'candidate':
+        major_minor = '.'.join(version.split('.', 2)[:2])
+        kwargs['channel'] = 'candidate-{}'.format(major_minor)
     cincinnati_uri, cincinnati_data = get_cincinnati_channel(cache=cache, **kwargs)
     canonical_errata_uri = errata_uri_from_cincinnati(version=version, cincinnati_data=cincinnati_data, cincinnati_uri=cincinnati_uri)
     if not canonical_errata_uri:
@@ -374,13 +378,13 @@ def semver_sort_key(version):
     # Precedence is defined in https://semver.org/spec/v2.0.0.html#spec-item-11
     identifiers = _SEMANTIC_VERSION_DELIMITERS.sub(' ', version)
     ids = []
-    for identifier in identifiers.split():
-        try:
-            i = int(identifier)
-        except ValueError:
-            ids.append(identifier)
-        else:
-            ids.append(i)
+    for indx, identifier in enumerate(identifiers.split()):
+        if indx < 3:
+            try:
+                identifier = int(identifier)
+            except ValueError:
+                pass
+        ids.append(identifier)
     return tuple(ids)
 
 
@@ -435,7 +439,7 @@ def semver_sort_key(version):
             subprocess.run(['git', 'fetch', upstream_remote], check=True)
             subprocess.run(['git', 'checkout', '{}/{}'.format(upstream_remote, upstream_branch)], check=True)
         stabilization_changes(
-            directory='channels',
+            directories={'channels', 'internal-channels'},
             github_repo=args.github_repo.strip(),
             github_token=args.github_token.strip(),
             webhook=args.webhook.strip(),
diff --git a/internal-channels/candidate.yaml b/internal-channels/candidate.yaml
new file mode 100644
index 000000000..b76fd0327
--- /dev/null
+++ b/internal-channels/candidate.yaml
@@ -0,0 +1,271 @@
+name: candidate
+tombstones:
+# Never got an errata
+- 4.5.0-0.hotfix-2020-11-28-021842
+# Shares an errata with a later release
+- 4.5.0
+- 4.5.25
+- 4.5.29
+- 4.5.32
+- 4.6.0
+- 4.6.2
+# Rerolling as 4.6.6 with a rebuilt CRI-O RPM
+- 4.6.5
+# Blocked on born-in-4.1 ingress regression: https://bugzilla.redhat.com/show_bug.cgi?id=1904582#c4
+- 4.6.7
+# Did not fix 4.6.9 OVS regression https://bugzilla.redhat.com/show_bug.cgi?id=1914284
+- 4.6.10
+# 4.6.24 introduced a regression in registry ca-trust handling: https://bugzilla.redhat.com/show_bug.cgi?id=1949040#c4
+- 4.6.24
+# Shares an errata with a later release
+- 4.6.33
+# 4.6.37 regressed on proxy handling https://bugzilla.redhat.com/show_bug.cgi?id=1978041
+- 4.6.37
+# 4.6.50 lacked some desired updates
+- 4.6.50
+# 4.7.10 installer segfaults on install-config serviceEndpoints https://bugzilla.redhat.com/show_bug.cgi?id=1958420
+- 4.7.10
+# 4.7.14 moved monitoring to hard-anti-affinity, and that can conflict with volume affinity https://bugzilla.redhat.com/show_bug.cgi?id=1967614
+- 4.7.14
+# 4.7.15 OVN EgressFirewall doesn't work well as expected https://bugzilla.redhat.com/show_bug.cgi?id=1970322
+- 4.7.15
+# 4.7.17 MCO does not cordone nodes on upgrade https://bugzilla.redhat.com/show_bug.cgi?id=1973006
+- 4.7.17
+# 4.7.20 unspecified behavior change
+- 4.7.20
+# 4.7.25 has a CRI-O path issue for born-before-4.6 clusters: https://bugzilla.redhat.com/show_bug.cgi?id=1995785
+- 4.7.25
+# 4.7.26 has a networking issue with vSphere clusters running HW14 and later. SDN Packet loss resulting in service unavailability.  https://bugzilla.redhat.com/show_bug.cgi?id=1987108
+- 4.7.26
+# 4.7.35 lacks metadata errata URIs for s390x and ppc64le
+- 4.7.35
+# 4.8.0 unspecified behavior change
+- 4.8.0
+# 4.8.1 s390x missed a kernel bump that went into the other platforms; rerolling as 4.8.2
+- 4.8.1
+# 4.8.6 has a CRI-O path issue for born-before-4.6 clusters: https://bugzilla.redhat.com/show_bug.cgi?id=1995785
+- 4.8.6
+# 4.8.7 has a networking issue with vSphere clusters running HW14 and later. SDN Packet loss resulting in service unavailability.  https://bugzilla.redhat.com/show_bug.cgi?id=1987108
+- 4.8.7
+# 4.8.16's amd64 build only has baked-in update edges from 4.7.35
+- 4.8.16
+# 4.9.1 lacked a baked-in update from 4.8.17
+- 4.9.1
+versions:
+- 4.5.0-0.hotfix-2020-08-24-185832
+- 4.5.0-0.hotfix-2020-11-28-021842
+- 4.5.0-rc.1
+- 4.5.0-rc.2
+- 4.5.0-rc.4
+- 4.5.0-rc.5
+- 4.5.0-rc.6
+- 4.5.0-rc.7
+- 4.5.1-rc.0
+- 4.5.0
+- 4.5.1
+- 4.5.2
+- 4.5.3
+- 4.5.4
+- 4.5.5
+- 4.5.6
+- 4.5.7
+- 4.5.8
+- 4.5.9
+- 4.5.10
+- 4.5.11
+- 4.5.12
+- 4.5.13
+- 4.5.14
+- 4.5.15
+- 4.5.16
+- 4.5.17
+- 4.5.18
+- 4.5.19
+- 4.5.20
+- 4.5.21
+- 4.5.22
+- 4.5.23
+- 4.5.24
+- 4.5.25
+- 4.5.27
+- 4.5.28
+- 4.5.29
+- 4.5.30
+- 4.5.31
+- 4.5.32
+- 4.5.33
+- 4.5.34
+- 4.5.35
+- 4.5.36
+- 4.5.37
+- 4.5.38
+- 4.5.39
+- 4.5.40
+- 4.5.41
+- 4.6.0-fc.0
+- 4.6.0-fc.1
+- 4.6.0-fc.2
+- 4.6.0-fc.3
+- 4.6.0-fc.4
+- 4.6.0-fc.5
+- 4.6.0-fc.7
+- 4.6.0-fc.8
+- 4.6.0-rc.0
+- 4.6.0-rc.1
+- 4.6.0-rc.2
+- 4.6.0-rc.3
+- 4.6.0-rc.4
+- 4.6.0
+- 4.6.1
+- 4.6.2
+- 4.6.3
+- 4.6.4
+- 4.6.5
+- 4.6.6
+- 4.6.7
+- 4.6.8
+- 4.6.9
+- 4.6.10
+- 4.6.12
+- 4.6.13
+- 4.6.15
+- 4.6.16
+- 4.6.17
+- 4.6.18
+- 4.6.19
+- 4.6.20
+- 4.6.21
+- 4.6.22
+- 4.6.23
+- 4.6.24
+- 4.6.25
+- 4.6.26
+- 4.6.27
+- 4.6.28
+- 4.6.29
+- 4.6.30
+- 4.6.31
+- 4.6.32
+- 4.6.33
+- 4.6.34
+- 4.6.35
+- 4.6.36
+- 4.6.37
+- 4.6.38
+- 4.6.39
+- 4.6.40
+- 4.6.41
+- 4.6.42
+- 4.6.43
+- 4.6.44
+- 4.6.45
+- 4.6.46
+- 4.6.47
+- 4.6.48
+- 4.6.49
+- 4.6.50
+- 4.6.51
+- 4.6.52
+- 4.7.0-fc.0
+- 4.7.0-fc.1
+- 4.7.0-fc.2
+- 4.7.0-fc.3
+- 4.7.0-fc.4
+- 4.7.0-fc.5
+- 4.7.0-rc.1
+- 4.7.0-rc.2
+- 4.7.0-rc.3
+- 4.7.0
+- 4.7.1
+- 4.7.2
+- 4.7.3
+- 4.7.4
+- 4.7.5
+- 4.7.6
+- 4.7.7
+- 4.7.8
+- 4.7.9
+- 4.7.10
+- 4.7.11
+- 4.7.12
+- 4.7.13
+- 4.7.14
+- 4.7.15
+- 4.7.16
+- 4.7.17
+- 4.7.18
+- 4.7.19
+- 4.7.20
+- 4.7.21
+- 4.7.22
+- 4.7.23
+- 4.7.24
+- 4.7.25
+- 4.7.26
+- 4.7.28
+- 4.7.29
+- 4.7.30
+- 4.7.31
+- 4.7.32
+- 4.7.33
+- 4.7.34
+- 4.7.35
+- 4.7.36
+- 4.7.37
+- 4.7.38
+- 4.7.39
+- 4.8.0-fc.0
+- 4.8.0-fc.1
+- 4.8.0-fc.2
+- 4.8.0-fc.3
+- 4.8.0-fc.5
+- 4.8.0-fc.7
+- 4.8.0-fc.8
+- 4.8.0-fc.9
+- 4.8.0-rc.0
+- 4.8.0-rc.1
+- 4.8.0-rc.2
+- 4.8.0-rc.3
+- 4.8.0
+- 4.8.1
+- 4.8.2
+- 4.8.3
+- 4.8.4
+- 4.8.5
+- 4.8.7
+- 4.8.9
+- 4.8.10
+- 4.8.11
+- 4.8.12
+- 4.8.13
+- 4.8.14
+- 4.8.15
+- 4.8.16
+- 4.8.17
+- 4.8.18
+- 4.8.19
+- 4.8.20
+- 4.8.21
+- 4.8.22
+- 4.8.23
+- 4.8.24
+- 4.9.0-fc.0
+- 4.9.0-fc.1
+- 4.9.0-rc.0
+- 4.9.0-rc.1
+- 4.9.0-rc.3
+- 4.9.0-rc.4
+- 4.9.0-rc.5
+- 4.9.0-rc.6
+- 4.9.0-rc.7
+- 4.9.0-rc.8
+- 4.9.0
+- 4.9.1
+- 4.9.4
+- 4.9.5
+- 4.9.6
+- 4.9.7
+- 4.9.8
+- 4.9.9
+- 4.9.10
+- 4.9.11
diff --git a/internal-channels/fast.yaml b/internal-channels/fast.yaml
new file mode 100644
index 000000000..c828d9987
--- /dev/null
+++ b/internal-channels/fast.yaml
@@ -0,0 +1,142 @@
+feeder:
+  errata: public
+  filter: 4\.[0-9]+\.[0-9]+(.*hotfix.*)?
+  name: candidate
+name: fast
+versions:
+- 4.5.0-0.hotfix-2020-08-24-185832
+- 4.5.1
+- 4.5.2
+- 4.5.3
+- 4.5.4
+- 4.5.5
+- 4.5.6
+- 4.5.7
+- 4.5.8
+- 4.5.9
+- 4.5.10
+- 4.5.11
+- 4.5.12
+- 4.5.13
+- 4.5.14
+- 4.5.15
+- 4.5.16
+- 4.5.17
+- 4.5.18
+- 4.5.19
+- 4.5.20
+- 4.5.21
+- 4.5.22
+- 4.5.23
+- 4.5.24
+- 4.5.27
+- 4.5.28
+- 4.5.30
+- 4.5.31
+- 4.5.33
+- 4.5.34
+- 4.5.35
+- 4.5.36
+- 4.5.37
+- 4.5.38
+- 4.5.39
+- 4.5.40
+- 4.5.41
+- 4.6.1
+- 4.6.3
+- 4.6.4
+- 4.6.6
+- 4.6.8
+- 4.6.9
+- 4.6.12
+- 4.6.13
+- 4.6.15
+- 4.6.16
+- 4.6.17
+- 4.6.18
+- 4.6.19
+- 4.6.20
+- 4.6.21
+- 4.6.22
+- 4.6.23
+- 4.6.25
+- 4.6.26
+- 4.6.27
+- 4.6.28
+- 4.6.29
+- 4.6.30
+- 4.6.31
+- 4.6.32
+- 4.6.34
+- 4.6.35
+- 4.6.36
+- 4.6.38
+- 4.6.39
+- 4.6.40
+- 4.6.41
+- 4.6.42
+- 4.6.43
+- 4.6.44
+- 4.6.45
+- 4.6.46
+- 4.6.47
+- 4.6.48
+- 4.6.49
+- 4.6.51
+- 4.7.0
+- 4.7.1
+- 4.7.2
+- 4.7.3
+- 4.7.4
+- 4.7.5
+- 4.7.6
+- 4.7.7
+- 4.7.8
+- 4.7.9
+- 4.7.11
+- 4.7.12
+- 4.7.13
+- 4.7.16
+- 4.7.18
+- 4.7.19
+- 4.7.21
+- 4.7.22
+- 4.7.23
+- 4.7.24
+- 4.7.28
+- 4.7.29
+- 4.7.30
+- 4.7.31
+- 4.7.32
+- 4.7.33
+- 4.7.34
+- 4.7.36
+- 4.7.37
+- 4.7.38
+- 4.7.39
+- 4.8.2
+- 4.8.3
+- 4.8.4
+- 4.8.5
+- 4.8.9
+- 4.8.10
+- 4.8.11
+- 4.8.12
+- 4.8.13
+- 4.8.14
+- 4.8.15
+- 4.8.17
+- 4.8.18
+- 4.8.19
+- 4.8.20
+- 4.8.21
+- 4.8.22
+- 4.8.23
+- 4.9.0
+- 4.9.4
+- 4.9.5
+- 4.9.6
+- 4.9.7
+- 4.9.8
+- 4.9.9
+- 4.9.10
diff --git a/internal-channels/stable.yaml b/internal-channels/stable.yaml
new file mode 100644
index 000000000..c66a891c1
--- /dev/null
+++ b/internal-channels/stable.yaml
@@ -0,0 +1,138 @@
+feeder:
+  delay: P1W
+  name: fast
+name: stable
+versions:
+- 4.5.0-0.hotfix-2020-08-24-185832
+- 4.5.1
+- 4.5.2
+- 4.5.3
+- 4.5.4
+- 4.5.5
+- 4.5.6
+- 4.5.7
+- 4.5.8
+- 4.5.9
+- 4.5.10
+- 4.5.11
+- 4.5.12
+- 4.5.13
+- 4.5.14
+- 4.5.15
+- 4.5.16
+- 4.5.17
+- 4.5.18
+- 4.5.19
+- 4.5.20
+- 4.5.21
+- 4.5.22
+- 4.5.23
+- 4.5.24
+- 4.5.27
+- 4.5.28
+- 4.5.30
+- 4.5.31
+- 4.5.33
+- 4.5.34
+- 4.5.35
+- 4.5.36
+- 4.5.37
+- 4.5.38
+- 4.5.39
+- 4.5.40
+- 4.5.41
+- 4.6.1
+- 4.6.3
+- 4.6.4
+- 4.6.6
+- 4.6.8
+- 4.6.9
+- 4.6.12
+- 4.6.13
+- 4.6.15
+- 4.6.16
+- 4.6.17
+- 4.6.18
+- 4.6.19
+- 4.6.20
+- 4.6.21
+- 4.6.22
+- 4.6.23
+- 4.6.25
+- 4.6.26
+- 4.6.27
+- 4.6.28
+- 4.6.29
+- 4.6.30
+- 4.6.31
+- 4.6.32
+- 4.6.34
+- 4.6.35
+- 4.6.36
+- 4.6.38
+- 4.6.39
+- 4.6.40
+- 4.6.41
+- 4.6.42
+- 4.6.43
+- 4.6.44
+- 4.6.45
+- 4.6.46
+- 4.6.47
+- 4.6.48
+- 4.6.49
+- 4.6.51
+- 4.7.0
+- 4.7.1
+- 4.7.2
+- 4.7.3
+- 4.7.4
+- 4.7.5
+- 4.7.6
+- 4.7.7
+- 4.7.8
+- 4.7.9
+- 4.7.11
+- 4.7.12
+- 4.7.13
+- 4.7.16
+- 4.7.18
+- 4.7.19
+- 4.7.21
+- 4.7.22
+- 4.7.23
+- 4.7.24
+- 4.7.28
+- 4.7.29
+- 4.7.30
+- 4.7.31
+- 4.7.32
+- 4.7.33
+- 4.7.34
+- 4.7.36
+- 4.7.37
+- 4.7.38
+- 4.8.2
+- 4.8.3
+- 4.8.4
+- 4.8.5
+- 4.8.9
+- 4.8.10
+- 4.8.11
+- 4.8.12
+- 4.8.13
+- 4.8.14
+- 4.8.15
+- 4.8.17
+- 4.8.18
+- 4.8.19
+- 4.8.20
+- 4.8.21
+- 4.8.22
+- 4.9.0
+- 4.9.4
+- 4.9.5
+- 4.9.6
+- 4.9.7
+- 4.9.8
+- 4.9.9