diff --git a/docs/index.md b/docs/index.md
index 8918b874..ab8a803e 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -208,6 +208,8 @@ A curated list of awesome references collected since 2018. Microservices archite
 - [Remote Tech Jobs](remote-tech-jobs.md)
 ## Customer Success Stories
 - [Customer Success Stories](customer.md)
+## Tags
+- [Tags](tags.md)
 
 ---
 <center>
diff --git a/docs/kubernetes.md b/docs/kubernetes.md
index cbbeab6e..beb28de4 100644
--- a/docs/kubernetes.md
+++ b/docs/kubernetes.md
@@ -1,3 +1,8 @@
+---
+tags:
+  - kubernetes
+  - tutorials
+---
 # Kubernetes
 
 {=="Kubernetes is not for application development but for platform development. Its magic is in enterprise standardization, not app portability" (Kelsey Hightower)==}
diff --git a/mkdocs.yml b/mkdocs.yml
index e3b3b0bb..1b93fb4d 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -3,11 +3,16 @@ site_url: https://redhatspain.com
 site_description: A curated list of awesome IT projects and resources. Inspired by the awesome list.
 site_author: info@redhatspain.com
 docs_dir: docs/
-repo_name: 'GitHub'
+#repo_name: 'GitHub'
+repo_name: redhatspain/awesome-kubernetes
 repo_url: https://github.com/redhatspain/awesome-kubernetes
+edit_uri: ""
 theme: 
   name: material 
   prev_next_buttons_location: both
+  icon:
+    logo: images/favicon-car.png
+    repo: fontawesome/brands/github
   favicon: images/favicon-car.png
   palette:
     - scheme: default
@@ -42,6 +47,9 @@ extra_css:
   - static/extra.css
 extra_javascript:
   - javascript/extra.js
+plugins:
+  - tags:
+      tags_file: tags.md
 markdown_extensions:
   - smarty
   - sane_lists
@@ -231,12 +239,34 @@ nav:
     - Freelancing: freelancing.md
     - Remote Tech Jobs: remote-tech-jobs.md
   - Clients: customer.md
+  - Tags: tags.md
   - About: about.md
 copyright: 2021 <a href="https://twitter.com/RedHatSpain">Red Hat Spain</a>, <a href="https://redhatspain.com/about/">about</a>.
 extra:
   analytics:
     provider: google
     property: !ENV GOOGLE_ANALYTICS_KEY
+    feedback:
+      title: Was this page helpful?
+      ratings:
+        - icon: material/emoticon-happy-outline
+          name: This page was helpful
+          data: 1
+          note: >-
+            Thanks for your feedback!
+        - icon: material/emoticon-sad-outline
+          name: This page could be improved
+          data: 0
+          note: >-  
+            Thanks for your feedback! Help us improve this page by
+            using our <a href="..." target=_blank>feedback form</a>.
+  consent:
+    title: Cookie consent
+    description: >- 
+      We use cookies to recognize your repeated visits and preferences, as well
+      as to measure the effectiveness of our documentation and whether users
+      find what they're searching for. With your consent, you're helping us to
+      make our documentation better.  
   social:
     - icon: fontawesome/brands/twitter
       link: https://twitter.com/redhatspain
diff --git a/tags.md b/tags.md
new file mode 100644
index 00000000..666446b6
--- /dev/null
+++ b/tags.md
@@ -0,0 +1,6 @@
+# Tags
+
+Following is a list of relevant tags:
+
+[TAGS]
+