diff --git a/archetypes/chapter.md b/archetypes/chapter.md
index 1e6605ab6a..240b6524f4 100644
--- a/archetypes/chapter.md
+++ b/archetypes/chapter.md
@@ -1,11 +1,13 @@
----
-title: "{{ replace .TranslationBaseName "-" " " | title }}"
-date: {{ .Date }}
-weight: 5
-pre: "<b>X. </b>" # HTML code as prefix in the menu
----
++++
+title = "{{ replace .TranslationBaseName "-" " " | title }}"
+date = {{ .Date }}
+weight = 5
+chapter = true
+pre = "<b>X. </b>"
++++
 
 ### Chapter X
 
-Lorem Ipsum.
-Notice `draft` is set to true.
\ No newline at end of file
+# Some Chapter title
+
+Lorem Ipsum.
\ No newline at end of file
diff --git a/archetypes/default.md b/archetypes/default.md
index 6bcf72cc2b..c89c2e40de 100644
--- a/archetypes/default.md
+++ b/archetypes/default.md
@@ -1,8 +1,7 @@
----
-title: "{{ replace .TranslationBaseName "-" " " | title }}"
-date: {{ .Date }}
-weight: 5
----
++++
+title = "{{ replace .TranslationBaseName "-" " " | title }}"
+date =  {{ .Date }}
+weight = 5
++++
 
-Lorem Ipsum.
-Notice `draft` is set to true.
\ No newline at end of file
+Lorem Ipsum.
\ No newline at end of file