diff --git a/_posts/2025-11-02-nextcloud-collation-version-mismatch.md b/_posts/2025-11-02-nextcloud-collation-version-mismatch.md
index 8a56ff2..1ea1080 100644
--- a/_posts/2025-11-02-nextcloud-collation-version-mismatch.md
+++ b/_posts/2025-11-02-nextcloud-collation-version-mismatch.md
@@ -1,6 +1,7 @@
 ---
 layout: post
 author: Sam Hadow
+tags: nextcloud
 ---
 
 On my server I self-host nextcloud with a PostgreSQL database and this container image *docker.io/library/nextcloud:fpm-alpine*.
diff --git a/archive.html b/archive.html
new file mode 100644
index 0000000..087a4f4
--- /dev/null
+++ b/archive.html
@@ -0,0 +1,32 @@
+---
+layout: default
+title: "Post Archive"
+permalink: /archive.html
+---
+<h1>All my posts organized by their tags</h1>
+
+<div id="tags-list">
+{% for tag in site.tags %}
+  {% assign tag_name = tag | first %}
+  {% assign tag_name_pretty = tag_name | replace: "_", " " | capitalize %}
+  <div class="tag-list">
+    <div id="#{{ tag_name | slugize }}"></div>
+    <h3 class="post-list-heading line-bottom"> In #{{ tag_name }}: </h3>
+    <a name="{{ tag_name | slugize }}"></a>
+    <ul class="post-list post-list-narrow">
+     {% for post in site.tags[tag_name] %}
+     <li>
+       {%- assign date_format = site.minima.date_format | default: "%b %-d, %Y" -%}
+       <b>
+         <a href="{{ post.url | relative_url }}">
+           {{ post.title | escape }}
+         </a>
+       </b> - <i>{{ post.date | date: date_format }}</i>
+     </li>
+     {% endfor %}
+    </ul>
+  </div>
+{% endfor %}
+</div>
+
+<!-- Code partially taken from https://emmatheeng.github.io/projects/blog_setup/blog-tags.html -->
diff --git a/blog.html b/blog.html
index 77258a3..c699fd9 100644
--- a/blog.html
+++ b/blog.html
@@ -7,12 +7,21 @@ title: Blog
 <ul>
   {% for post in site.posts %}
     <li>
-      <h2>
+      <h2 style="margin-bottom: 0.6em;">
         <a href="{{ post.url }}">{{ post.title }}</a>
         <span style="font-size: 0.6em; font-style: italic; margin-left: 0.5rem;">
           {{ post.date | date: "%B %d, %Y" }}
         </span>
       </h2>
+        <span style="display: block; font-size: 0.8em; font-style: italic; margin-bottom: 0.6em;">
+          {%- if post.tags -%}
+            {% for tag in post.tags %}
+              <a href="{{ site.baseurl }}/archive.html#{{ tag | slugify }}">
+                #{{ tag }}
+              </a>
+            {% endfor %}
+          {%- endif -%}
+        </span>
       {{ post.excerpt }}
     </li>
   {% endfor %}