diff --git a/OliverBooth/Controllers/Blog/BlogApiController.cs b/OliverBooth/Controllers/Blog/BlogApiController.cs
index 7065ae0..792186f 100644
--- a/OliverBooth/Controllers/Blog/BlogApiController.cs
+++ b/OliverBooth/Controllers/Blog/BlogApiController.cs
@@ -77,6 +77,7 @@ public sealed class BlogApiController : ControllerBase
             excerpt = _blogPostService.RenderExcerpt(post, out bool trimmed),
             content = includeContent ? _blogPostService.RenderPost(post) : null,
             trimmed,
+            tags = post.Tags.Select(t => t.Replace(' ', '-')),
             url = new
             {
                 year = post.Published.ToString("yyyy"),
diff --git a/OliverBooth/Data/Blog/BlogPost.cs b/OliverBooth/Data/Blog/BlogPost.cs
index e1e1c3f..cfb1110 100644
--- a/OliverBooth/Data/Blog/BlogPost.cs
+++ b/OliverBooth/Data/Blog/BlogPost.cs
@@ -34,6 +34,9 @@ internal sealed class BlogPost : IBlogPost
     /// <inheritdoc />
     public string Slug { get; internal set; } = string.Empty;
 
+    /// <inheritdoc />
+    public IReadOnlyList<string> Tags { get; internal set; } = ArraySegment<string>.Empty;
+
     /// <inheritdoc />
     public string Title { get; internal set; } = string.Empty;
 
diff --git a/OliverBooth/Data/Blog/Configuration/BlogPostConfiguration.cs b/OliverBooth/Data/Blog/Configuration/BlogPostConfiguration.cs
index a248d96..7c89b2b 100644
--- a/OliverBooth/Data/Blog/Configuration/BlogPostConfiguration.cs
+++ b/OliverBooth/Data/Blog/Configuration/BlogPostConfiguration.cs
@@ -28,5 +28,10 @@ internal sealed class BlogPostConfiguration : IEntityTypeConfiguration<BlogPost>
         builder.Property(e => e.DisqusPath).IsRequired(false);
         builder.Property(e => e.Visibility).HasConversion(new EnumToStringConverter<BlogPostVisibility>()).IsRequired();
         builder.Property(e => e.Password).HasMaxLength(255).IsRequired(false);
+        builder.Property(e => e.Tags).IsRequired()
+            .HasConversion(
+                tags => string.Join(' ', tags.Select(t => t.Replace(' ', '-'))),
+                tags => tags.Split(' ', StringSplitOptions.RemoveEmptyEntries)
+                    .Select(t => t.Replace('-', ' ')).ToArray());
     }
 }
diff --git a/OliverBooth/Data/Blog/IBlogPost.cs b/OliverBooth/Data/Blog/IBlogPost.cs
index 6cf646a..a8b9818 100644
--- a/OliverBooth/Data/Blog/IBlogPost.cs
+++ b/OliverBooth/Data/Blog/IBlogPost.cs
@@ -63,6 +63,12 @@ public interface IBlogPost
     /// <value>The slug of the post.</value>
     string Slug { get; }
 
+    /// <summary>
+    ///     Gets the tags of the post.
+    /// </summary>
+    /// <value>The tags of the post.</value>
+    IReadOnlyList<string> Tags { get; }
+
     /// <summary>
     ///     Gets the title of the post.
     /// </summary>
diff --git a/OliverBooth/Pages/Blog/Article.cshtml b/OliverBooth/Pages/Blog/Article.cshtml
index 3432113..6907dd7 100644
--- a/OliverBooth/Pages/Blog/Article.cshtml
+++ b/OliverBooth/Pages/Blog/Article.cshtml
@@ -64,6 +64,13 @@
         <a href="#disqus_thread" data-disqus-identifier="@post.GetDisqusIdentifier()">0 Comments</a>
     }
 </p>
+<div>
+    @foreach (string tag in post.Tags)
+    {
+        <a asp-page="Index" asp-route-tag="@tag" class="badge bg-secondary">@tag</a>
+    }
+</div>
+<hr>
 
 <article data-blog-post="true" data-blog-id="@post.Id.ToString("D")">
     <p class="text-center">Loading ...</p>
diff --git a/OliverBooth/Pages/Blog/Index.cshtml b/OliverBooth/Pages/Blog/Index.cshtml
index 75b6dd0..e5d36bd 100644
--- a/OliverBooth/Pages/Blog/Index.cshtml
+++ b/OliverBooth/Pages/Blog/Index.cshtml
@@ -38,4 +38,9 @@
             </p>
         {{/if}}
     </div>
+    <div class="card-footer">
+        {{#each post.tags}}
+            <a href="?tag={{this}}" class="badge text-bg-dark">{{this}}</a>
+        {{/each}}
+    </div>
 </script>
diff --git a/src/ts/BlogPost.ts b/src/ts/BlogPost.ts
index 4c4dac5..e57e689 100644
--- a/src/ts/BlogPost.ts
+++ b/src/ts/BlogPost.ts
@@ -14,6 +14,7 @@ class BlogPost {
     private readonly _identifier: string;
     private readonly _humanizedTimestamp: string;
     private readonly _formattedDate: string;
+    private readonly _tags: string[];
 
     constructor(json: any) {
         this._id = json.id;
@@ -29,6 +30,7 @@ class BlogPost {
         this._identifier = json.identifier;
         this._humanizedTimestamp = json.humanizedTimestamp;
         this._formattedDate = json.formattedDate;
+        this._tags = json.tags;
     }
 
     get id(): string {
@@ -66,6 +68,10 @@ class BlogPost {
     get url(): BlogUrl {
         return this._url;
     }
+    
+    get tags(): string[] {
+        return this._tags;
+    }
 
     get trimmed(): boolean {
         return this._trimmed;
diff --git a/src/ts/UI.ts b/src/ts/UI.ts
index 36f14e9..f5444f5 100644
--- a/src/ts/UI.ts
+++ b/src/ts/UI.ts
@@ -55,6 +55,7 @@ class UI {
                 enable_comments: post.commentsEnabled,
                 disqus_identifier: post.identifier,
                 trimmed: post.trimmed,
+                tags: post.tags
             },
             author: {
                 name: author.name,