diff --git a/templates/email-template.txt b/templates/email-template.txt
index d507389..ced60a8 100644
--- a/templates/email-template.txt
+++ b/templates/email-template.txt
@@ -8,18 +8,18 @@ A few sentences describing the issue at a high level.
A comma separated list of affected services and OpenStack releases.
### Discussion ###
-A detailed discussion of the problem. This should have enough detail that the
-person reading can determine if their deployment is affected, when the problem
-was introduced, and what types of attacks/problems that an affected deployment
-would be exposed to.
+A detailed discussion of the problem. This should have enough detail
+that the person reading can determine if their deployment is affected,
+when the problem was introduced, and what types of attacks/problems that
+an affected deployment would be exposed to.
### Recommended Actions ###
A detailed description of what can be done to remediate the problem (if
-possible). If the recommendation involves configuration changes, example
-snippets of configuration files should be included here.
+possible). If the recommendation involves configuration changes,
+example snippets of configuration files should be included here.
### Contacts / References ###
-This OSSN :
+This OSSN :
Original LaunchPad Bug :
OpenStack Security ML : openstack-security@lists.openstack.org
OpenStack Security Group : https://launchpad.net/~openstack-ossg
diff --git a/templates/wiki-template.txt b/templates/wiki-template.txt
index bbb81a2..c7c88a6 100644
--- a/templates/wiki-template.txt
+++ b/templates/wiki-template.txt
@@ -8,18 +8,18 @@ A few sentences describing the issue at a high level.
A comma separated list of affected services and OpenStack releases.
=== Discussion ===
-A detailed discussion of the problem. This should have enough detail that the
-person reading can determine if their deployment is affected, when the problem
-was introduced, and what types of attacks/problems that an affected deployment
-would be exposed to.
+A detailed discussion of the problem. This should have enough detail
+that the person reading can determine if their deployment is affected,
+when the problem was introduced, and what types of attacks/problems that
+an affected deployment would be exposed to.
=== Recommended Actions ===
A detailed description of what can be done to remediate the problem (if
-possible). If the recommendation involves configuration changes, example
-snippets of configuration files should be included here.
+possible). If the recommendation involves configuration changes,
+example snippets of configuration files should be included here.
=== Contacts / References ===
-* This OSSN :
+* This OSSN :
* Original LaunchPad Bug :
* OpenStack Security ML : openstack-security@lists.openstack.org
* OpenStack Security Group : https://launchpad.net/~openstack-ossg