diff --git a/archetypes/default.md b/archetypes/default.md
index 00e77bd..6e2b465 100644
--- a/archetypes/default.md
+++ b/archetypes/default.md
@@ -1,6 +1,8 @@
 ---
 title: "{{ replace .Name "-" " " | title }}"
 date: {{ .Date }}
+lastmod: {{ now }}
 draft: true
+tags: []
+topics: []
 ---
-
diff --git a/config.toml b/config.toml
index 0a8bec3..8fae1f8 100644
--- a/config.toml
+++ b/config.toml
@@ -12,6 +12,7 @@ paginate = 10
 PygmentsCodeFences = true
 PygmentsStyle = "tango"
 enableInlineShortcodes = true
+enableGitInfo = true
 
 [indexes]
     tag = "tags"
@@ -28,7 +29,13 @@ enableInlineShortcodes = true
 [markup]
   [markup.goldmark.renderer]
     unsafe= true
-    
+
+[frontmatter]
+    date = ["date", "publishDate", "lastmod"]
+    lastmod = ["lastmod", ":git", "date", "publishDate"]
+    publishDate = ["publishDate", "date"]
+    expiryDate = ["expiryDate"]
+
 [menu]
     [[menu.main]]
         name = "Home"
diff --git a/content/post/soaping-with-rest.md b/content/post/soaping-with-rest.md
index 408b2bf..96ae763 100644
--- a/content/post/soaping-with-rest.md
+++ b/content/post/soaping-with-rest.md
@@ -110,4 +110,3 @@ Request/Response headers:
 
 That's it. I hope this has been helpful. Incidentally, if you want to experiment with the code yourself, the repo is available **{{< newtab title="right here." url="https://gitea.gmgauthier.com/gmgauthier/soapmock" >}}** Enjoy!
 
-Last Change: {{< time.inline >}}{{ now }}{{< /time.inline >}}
diff --git a/content/post/something-different-for-a-change3.md b/content/post/something-different-for-a-change3.md
new file mode 100644
index 0000000..f2f102c
--- /dev/null
+++ b/content/post/something-different-for-a-change3.md
@@ -0,0 +1,11 @@
+---
+title: "Something Different for a Change3"
+date: 2021-04-11T21:48:01+01:00
+lastmod: 2021-04-11 21:48:01.362115 +0100 BST m=+0.047984696
+draft: true
+tags: []
+topics: []
+---
+
+{{ .Lastmod }}
+{{ .GitInfo.AuthorDate }}
\ No newline at end of file
diff --git a/content/post/testing-new-shortcodes.md b/content/post/testing-new-shortcodes.md
index df3976d..04708d6 100644
--- a/content/post/testing-new-shortcodes.md
+++ b/content/post/testing-new-shortcodes.md
@@ -61,5 +61,3 @@ var y = 6;
 var z = x + y;
 document.getElementById("demo").innerHTML = "The value of z is: " + z;
 ```
-
-Latest Build Time: {{< time.inline >}}{{ now }}{{< /time.inline >}}