diff --git a/Gemfile b/Gemfile
index 12bc8fa6..63333ec0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,4 +6,5 @@ gem "minimal-mistakes-jekyll", "~> 4.24"
 gem "github-pages", "~> 228"
 gem "jekyll-include-cache", "~> 0.2.1"
 gem "jekyll-redirect-from", "~> 0.16.0"
+gem "jekyll-archives", "~> 2.2"
 gem "open_uri_redirections", "~> 0.2.1"
diff --git a/_config.yml b/_config.yml
index a7732417..77c044e7 100644
--- a/_config.yml
+++ b/_config.yml
@@ -183,6 +183,7 @@ plugins:
   - jekyll-feed
   - jekyll-include-cache
   - jekyll-redirect-from
+  - jekyll-archives
 
 # mimic GitHub Pages with --safe
 whitelist:
@@ -192,14 +193,28 @@ whitelist:
   - jekyll-feed
   - jekyll-include-cache
   - jekyll-redirect-from
+  - jekyll-archives
 
+# Category and Tag Archives (jekyll-archives)
+# Generates individual pages for each category and tag
 category_archive:
-  type: liquid
+  type: jekyll-archives
   path: /categories/
 tag_archive:
-  type: liquid
+  type: jekyll-archives
   path: /tags/
 
+jekyll-archives:
+  enabled:
+    - categories
+    - tags
+  layouts:
+    category: archive-taxonomy
+    tag: archive-taxonomy
+  permalinks:
+    category: /categories/:name/
+    tag: /tags/:name/
+
 # HTML Compression
 # - https://jch.penibelst.de/
 compress_html: