diff --git a/releases/modules/ROOT/pages/f36/index.adoc b/releases/modules/ROOT/pages/f36/index.adoc
index d0ba718..270e4ca 100644
--- a/releases/modules/ROOT/pages/f36/index.adoc
+++ b/releases/modules/ROOT/pages/f36/index.adoc
@@ -7,17 +7,15 @@ User documentation, when available, will be at https://docs.fedoraproject.org/en
 == Quick links
 
 * https://qa.fedoraproject.org/blockerbugs/milestone/{release-version}/beta/buglist[Beta] and https://qa.fedoraproject.org/blockerbugs/milestone/{release-version}/final/buglist[Final] blockers
-* https://fedoraproject.org/wiki/Releases/36/ChangeSet[Change Set]
+* https://fedoraproject.org/wiki/Releases/{release-version}/ChangeSet[Change Set]
 * xref:f{release-version}/blocking.adoc[Release-Blocking Deliverables]
-* https://fedorapeople.org/groups/schedule/f-36/f-36-key-tasks.html[Schedule]
+* https://fedorapeople.org/groups/schedule/f-{release-version}/f-{release-version}-key-tasks.html[Schedule]
 * xref:f{release-version}/spins.adoc[Spins and Labs]
 
 == Assorted tracking bugs
 
-* https://bugzilla.redhat.com/buglist.cgi?bug_status=$$__open__$$&f1=blocked&list_id=11983255&o1=substring&query_format=advanced&v1=1992484[Failed to Build]
-* https://bugzilla.redhat.com/buglist.cgi?bug_status=$$__open__$$&f1=blocked&list_id=11983255&o1=substring&query_format=advanced&v1=1992487[Failed to Install]
-* https://bugzilla.redhat.com/buglist.cgi?bug_status=$$__open__$$&f1=blocked&list_id=11983255&o1=substring&query_format=advanced&v1=1992484[Failed to Build]
-* https://bugzilla.redhat.com/buglist.cgi?bug_status=$$__open__$$&f1=blocked&list_id=11983255&o1=substring&query_format=advanced&v1=1992487[Failed to Install]
+* https://bugzilla.redhat.com/buglist.cgi?bug_status=$$__open__$$&f1=blocked&list_id=11983255&o1=substring&query_format=advanced&v1=F{release-version}FTBFS[Failed to Build]
+* https://bugzilla.redhat.com/buglist.cgi?bug_status=$$__open__$$&f1=blocked&list_id=11983255&o1=substring&query_format=advanced&v1=F{release-version}FailsToInstall[Failed to Install]
 * https://bugzilla.redhat.com/show_bug.cgi?id=F{release-version}BetaBlocker[Beta Blockers]
 * https://bugzilla.redhat.com/show_bug.cgi?id=F{release-version}BetaFreezeException[Beta Freeze Exceptions]
 * https://bugzilla.redhat.com/show_bug.cgi?id=F{release-version}FinalBlocker[Final Blockers]