diff --git a/modules/ROOT/pages/pgm_guide/release_process.adoc b/modules/ROOT/pages/pgm_guide/release_process.adoc
index 0c8fc2f..e8dd791 100644
--- a/modules/ROOT/pages/pgm_guide/release_process.adoc
+++ b/modules/ROOT/pages/pgm_guide/release_process.adoc
@@ -139,21 +139,27 @@ https://docs.fedoraproject.org/en-US/quick-docs/howto-file-a-bug/
 === Rawhide Rebase
 All of the following condiditions must be met:
 
+* product == "Fedora" or "Fedora Container Images"
 * version == rawhide
 * component != "Package Review"
 * component != "kernel"
-* opened against rawhide before 2019-08-13 (Rawhide Branching date is 2019-08-13)
+* component != "Changes Tracking"
 * keyword ''FutureFeature'' is '''not''' present
 * keyword ''Tracking'' is '''not''' present
 * the string ''RFE'' is '''not''' present in the summary
 * status != CLOSED
 
-* You can use this https://bugzilla.redhat.com/buglist.cgi?classification=Fedora&f1=component&f2=creation_ts&f3=component&f4=bug_status&keywords=FutureFeature%2C%20Tracking%2C%20&keywords_type=nowords&list_id=8447069&o1=notequals&o2=lessthan&o3=notequals&o4=notequals&product=Fedora&query_format=advanced&short_desc=RFE&short_desc_type=notregexp&v1=Package%20Review&v2=2019-08-13&v3=kernel&v4=CLOSED&version=rawhide[Bugzilla query] to select bugs that meet the criteria above.
+WARNING: If you run this after Branch Day, you will need to add constraint on the bug open date.
+
+* You can use this https://bugzilla.redhat.com/buglist.cgi?classification=Fedora&f1=component&f3=component&f4=bug_status&f5=component&keywords=FutureFeature%2C%20Tracking%2C%20&keywords_type=nowords&limit=0&list_id=10831817&o1=notequals&o3=notequals&o4=notequals&o5=notequals&order=changeddate%20DESC%2Cbug_status%2Cpriority%2Cassigned_to%2Cbug_id&product=Fedora&product=Fedora%20Container%20Images&query_format=advanced&short_desc=RFE&short_desc_type=notregexp&v1=Package%20Review&v3=kernel&v4=CLOSED&v5=Changes%20Tracking&version=rawhide[Bugzilla query] to select bugs that meet the criteria above.
 
 Save the results as a CSV file and run the https://pagure.io/fedora-project-schedule/blob/master/f/scripts/closebugs/fedora_rebase.pl[`fedora_rebase.pl` script] against it. For example:
 
 `fedora_rebase.pl 31 bugs-2019-08-13.csv`
 
+You should then change the Changes Tracking bugs to the branched version.
+The reason to do this separately is to manually deselect Changes targeted to N+2, which seem to always exist by Branch Day.
+
 WARNING: This script will take a while to run.
 Execute it from a machine with stable power and networking.