diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3732246..996ad4a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## Dradis Framework 3.22 (April, 2021) ##
 
-*   No changes.
+*   Update default configuration to match welcome kit
 
 ## Dradis Framework 3.21 (February, 2021) ##
 
diff --git a/templates/evidence.template b/templates/evidence.template
index 20d4be0..b501982 100644
--- a/templates/evidence.template
+++ b/templates/evidence.template
@@ -1,20 +1,11 @@
-#[Host]#
-%issue.host%
-
-#[Path]#
-%issue.path%
-
 #[Location]#
 %issue.location%
 
-#[Severity]#
-%issue.severity%
+#[Output]#
+*Request*
 
-#[Confidence]#
-%issue.confidence%
-
-#[Request]#
 bc.. %issue.request%
 
-#[Response]#
+p. *Response*
+
 bc.. %issue.response%
diff --git a/templates/html_evidence.template b/templates/html_evidence.template
index d270bca..2383a3b 100644
--- a/templates/html_evidence.template
+++ b/templates/html_evidence.template
@@ -1,50 +1,35 @@
-#[Host]#
-%issue.host%
-
-
-#[Path]#
-%issue.path%
-
-
 #[Location]#
 %issue.location%
 
+#[Output]#
+p. *Request 1*
 
-#[Severity]#
-%issue.severity%
-
-
-#[Confidence]#
-%issue.confidence%
-
-
-#[Request]#
 bc.. %issue.request%
 
+p. *Response 1*
 
-#[Response]#
 bc.. %issue.response%
 
+p. *Request 2*
 
-#[Request 1]#
 bc.. %issue.request_1%
 
+p. *Response 2*
 
-#[Response 1]#
 bc.. %issue.response_1%
 
+p. *Request 3*
 
-#[Request 2]#
 bc.. %issue.request_2%
 
+p. *Response 3*
 
-#[Response 2]#
 bc.. %issue.response_2%
 
+p. *Request 4*
 
-#[Request 3]#
 bc.. %issue.request_3%
 
+p. *Response 4*
 
-#[Response 3]#
 bc.. %issue.response_3%
diff --git a/templates/issue.template b/templates/issue.template
index f71ea91..55a1cad 100644
--- a/templates/issue.template
+++ b/templates/issue.template
@@ -1,30 +1,20 @@
 #[Title]#
 %issue.name%
 
-
-#[Severity]#
+#[CVSSv3.BaseScore]#
 %issue.severity%
 
+#[CVSSv3.Vector]#
+n/a
 
-#[Background]#
-%issue.background%
+#[Type]#
+External
 
+#[Description]#
+%issue.background%
 
-#[RemediationBackground]#
+#[Solution]#
 %issue.remediation_background%
 
-
-#[Detail]#
-%issue.detail%
-
-
-#[RemediationDetails]#
-%issue.remediation_detail%
-
-
 #[References]#
 %issue.references%
-
-
-#[Classifications]#
-%issue.vulnerability_classifications%