diff --git a/templates/email-template.txt b/template.txt
similarity index 100%
rename from templates/email-template.txt
rename to template.txt
diff --git a/templates/wiki-template.txt b/templates/wiki-template.txt
deleted file mode 100644
index c7c88a6..0000000
--- a/templates/wiki-template.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-__NOTOC__
-== Title (single sentence) ==
-
-=== Summary ===
-A few sentences describing the issue at a high level.
-
-=== Affected Services / Software ===
-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.
-
-=== 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.
-
-=== Contacts / References ===
-* This OSSN :<link to OSSN on wiki>
-* Original LaunchPad Bug : <link to launchpad bug for affected project/service>
-* OpenStack Security ML : openstack-security@lists.openstack.org
-* OpenStack Security Group : https://launchpad.net/~openstack-ossg
-* CVE: <CVE number if one was filed>