diff --git a/CHANGELOG.md b/CHANGELOG.md
index 974cf96..a7fee59 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/full_evidence.template b/templates/full_evidence.template
index 342ead7..9a839f3 100644
--- a/templates/full_evidence.template
+++ b/templates/full_evidence.template
@@ -1,8 +1,5 @@
-#[ID]#
-%evidence.id%
-
-#[Status]#
+#[Location]#
 %evidence.status%
 
-#[Content]#
-%evidence.content%
+#[Output]#
+bc.. %evidence.content%
diff --git a/templates/full_vulnerability.template b/templates/full_vulnerability.template
index e9ac823..a0d92c6 100644
--- a/templates/full_vulnerability.template
+++ b/templates/full_vulnerability.template
@@ -1,34 +1,20 @@
 #[Title]#
 %vulnerability.title%
 
-#[Nexpose Id]#
-%vulnerability.nexpose_id%
-
-#[Severity]#
-%vulnerability.severity%
-
-#[PCI Severity]#
-%vulnerability.pci_severity%
-
-#[CVSS Score]#
+#[CVSSv3.BaseScore]#
 %vulnerability.cvss_score%
 
-#[CVSS Vector]#
+#[CVSSv3.Vector]#
 %vulnerability.cvss_vector%
 
-#[Published]#
-%vulnerability.published%
+#[Type]#
+Internal
 
 #[Description]#
 %vulnerability.description%
 
-
 #[Solution]#
 %vulnerability.solution%
 
-
 #[References]#
 %vulnerability.references%
-
-#[Tags]#
-%vulnerability.tags%
\ No newline at end of file