diff --git a/security-info/canary-template.md b/security-info/canary-template.md
index c9061bc7..bc6db262 100644
--- a/security-info/canary-template.md
+++ b/security-info/canary-template.md
@@ -10,24 +10,23 @@ Canary Template
 ~~~
 Dear Qubes community,
 
-We have just published Qubes Canary #<number>. The text of this Canary is
+We have just published Qubes Canary #<number>. The text of this canary is
 reproduced below. This canary and its accompanying signatures will always be
 available in the Qubes Security Pack (qubes-secpack).
 
 View Canary #<number> in the qubes-secpack:
 
-https://github.com/QubesOS/qubes-secpack/blob/master/canaries/canary-`<number>`-`<year>`.txt
+<https://github.com/QubesOS/qubes-secpack/blob/master/canaries/canary-`<number>`-`<year>`.txt>
 
 Learn about the qubes-secpack, including how to obtain, verify, and read it:
 
-https://www.qubes-os.org/doc/security-pack/
+<https://www.qubes-os.org/doc/security-pack/>
 
 View all past canaries:
 
-https://www.qubes-os.org/doc/canaries/
-
---------------------------------------------------------------------------------
+<https://www.qubes-os.org/doc/canaries/>
 
+```
                     ---===[ Qubes Canary #<number> ]===---
 
 
@@ -55,5 +54,7 @@ Footnotes
 ----------
 
 [...]
+```
 
 ~~~
+
diff --git a/security-info/security-bulletins-template.md b/security-info/security-bulletins-template.md
index 1cdfde06..eedefc57 100644
--- a/security-info/security-bulletins-template.md
+++ b/security-info/security-bulletins-template.md
@@ -11,24 +11,22 @@ Security Bulletin Template
 Dear Qubes community,
 
 We have just published Qubes Security Bulletin (QSB) #<number>: <title>.
-The current text of this QSB is reproduced below. The latest version, including
-any future corrections, will always be available in the Qubes Security Pack
-(qubes-secpack).
+The text of this QSB is reproduced below. This QSB and its accompanying
+signatures will always be available in the Qubes Security Pack (qubes-secpack).
 
 View QSB #<number> in the qubes-secpack:
 
-https://github.com/QubesOS/qubes-secpack/blob/master/QSBs/qsb-`<number>`-`<year>`.txt
+<https://github.com/QubesOS/qubes-secpack/blob/master/QSBs/qsb-`<number>`-`<year>`.txt>
 
 Learn about the qubes-secpack, including how to obtain, verify, and read it:
 
-https://www.qubes-os.org/doc/security-pack/
+<https://www.qubes-os.org/doc/security-pack/>
 
 View all past QSBs:
 
-https://www.qubes-os.org/doc/security-bulletins/
-
---------------------------------------------------------------------------------
+<https://www.qubes-os.org/doc/security-bulletins/>
 
+```
              ---===[ Qubes Security Bulletin #<number>]===---
 
                                   <date>
@@ -73,4 +71,7 @@ References
 --
 The Qubes Security Team
 https://www.qubes-os.org/security/
+```
+
 ~~~
+