diff --git a/Gemfile b/Gemfile
index c1e88da0..86242431 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,4 +11,5 @@ group :jekyll_plugins do
     gem "jekyll-seo-tag"
     gem 'jekyll-default-layout'
     gem 'jekyll-include-cache'
+    gem 'jekyll-tagging'
 end
diff --git a/_config.yml b/_config.yml
index 12466913..1b1b901c 100644
--- a/_config.yml
+++ b/_config.yml
@@ -32,6 +32,7 @@ plugins:
   - jekyll-last-modified-at
   - jekyll-redirect-from
   - jekyll-default-layout
+  - jekyll-tagging
 
 color_scheme: "light"
 url: "https://hack-gpon.github.io"
@@ -117,3 +118,6 @@ just_the_docs:
     sfp_cage:
       name: SFP cage
       nav_fold: false
+
+tag_page_layout: tag_page
+tag_page_dir: tag
\ No newline at end of file
diff --git a/_layouts/tag_page.html b/_layouts/tag_page.html
new file mode 100644
index 00000000..fe2222df
--- /dev/null
+++ b/_layouts/tag_page.html
@@ -0,0 +1,10 @@
+---
+layout: default
+title: {{ page.tag }}
+---
+
+<ul>
+    {% for post in page.posts %}
+      <li><a href="{{ post.url }}">{{ post.title }}</a> ({{ post.date | date_to_string }} | Tags: {{ post | tags }})</li>
+    {% endfor %}
+</ul>
\ No newline at end of file
diff --git a/_ont/ont-adtran-sdx-611q-.md b/_ont/ont-adtran-sdx-611q-.md
index 782b2d91..aedc5eb2 100644
--- a/_ont/ont-adtran-sdx-611q-.md
+++ b/_ont/ont-adtran-sdx-611q-.md
@@ -2,6 +2,7 @@
 title: Adtran SDX 611Q
 has_children: false
 layout: default
+tag: gpon hsgmii
 ---
 
 # Hardware Specifications
diff --git a/_ont/ont-carlitoxxpro-cpgos03-0490-v1.md b/_ont/ont-carlitoxxpro-cpgos03-0490-v1.md
index 943e1b0e..6f353510 100644
--- a/_ont/ont-carlitoxxpro-cpgos03-0490-v1.md
+++ b/_ont/ont-carlitoxxpro-cpgos03-0490-v1.md
@@ -4,4 +4,5 @@ has_children: false
 redirect_to: /ont-hilink-hl23446
 layout: default
 parent: CarlitoxxPro
+tag: gpon hsgmii
 ---
\ No newline at end of file
diff --git a/_ont/ont-carlitoxxpro-cpgos03-0490-v2.md b/_ont/ont-carlitoxxpro-cpgos03-0490-v2.md
index 08da5df8..90a5ffd4 100644
--- a/_ont/ont-carlitoxxpro-cpgos03-0490-v2.md
+++ b/_ont/ont-carlitoxxpro-cpgos03-0490-v2.md
@@ -3,6 +3,7 @@ title: CarlitoxxPro CPGOS03-0490 v2
 has_children: false
 layout: default
 parent: CarlitoxxPro
+tag: gpon
 ---
 
 # Hardware Specifications
diff --git a/_plugins/ext.rb b/_plugins/ext.rb
new file mode 100644
index 00000000..8c6e2a1a
--- /dev/null
+++ b/_plugins/ext.rb
@@ -0,0 +1 @@
+require 'jekyll/tagging'
\ No newline at end of file