diff --git a/source/_layouts/base.html.twig b/source/_layouts/base.html.twig
index 533f37631..0feedcceb 100644
--- a/source/_layouts/base.html.twig
+++ b/source/_layouts/base.html.twig
@@ -8,7 +8,11 @@
 
         <div class="max-w-2xl px-4 py-10 mx-auto md:py-16">
             <div id="main-content">
-                <h1 class="text-xl font-bold md:text-2xl">{{ page.title }}</h1>
+                <h1 class="text-xl font-bold md:text-2xl">
+                    {% block page_title %}
+                        {{ page.title }}
+                    {% endblock %}
+                </h1>
 
                 <div class="mt-4">
                     {% block content_wrapper %}
diff --git a/source/_pages/blog.html.twig b/source/_pages/blog.html.twig
index d1c0e96af..b22001c84 100644
--- a/source/_pages/blog.html.twig
+++ b/source/_pages/blog.html.twig
@@ -8,16 +8,8 @@ intro_text: |
 
 <div class="mt-10">
     <div class="space-y-8">
-        {% for talk in data.posts|sort((a, b) => a.date < b.date) %}
-            <article>
-                <h2>
-                    <a class="text-blue-800 dark:text-blue-400" href="{{ talk.url }}">
-                        {{ talk.title }}
-                    </a>
-                </h2>
-
-                <p class="mt-1">{{ talk.excerpt }}</p>
-            </article>
+        {% for post in data.posts|sort((a, b) => a.date < b.date) %}
+            {% include 'post/post-teaser' with { post } only %}
         {% endfor %}
     </div>
 </div>
diff --git a/source/_partials/post/post-teaser.html.twig b/source/_partials/post/post-teaser.html.twig
new file mode 100644
index 000000000..95f648555
--- /dev/null
+++ b/source/_partials/post/post-teaser.html.twig
@@ -0,0 +1,9 @@
+<article>
+    <h2>
+        <a class="text-blue-800 dark:text-blue-400" href="{{ post.url }}">
+            {{ post.title }}
+        </a>
+    </h2>
+
+    <p class="mt-1">{{ post.excerpt }}</p>
+</article>
diff --git a/source/blog/tags/tag.html b/source/blog/tags/tag.html
new file mode 100644
index 000000000..d8cfe4dab
--- /dev/null
+++ b/source/blog/tags/tag.html
@@ -0,0 +1,18 @@
+---
+title: Tag Archive
+layout: page
+generator:
+    - posts_tag_index
+---
+
+{% block page_title %}
+    {{ page.title }}: {{ page.tag }}
+{% endblock %}
+
+{% block content %}
+    <div class="space-y-8">
+        {% for post in page.tag_posts %}
+            {% include 'post/post-teaser' with { post } only %}
+        {% endfor %}
+    </div>
+{% endblock %}