diff --git a/src/feeds/atom.njk b/src/feeds/atom.njk
index 2b4031c..7f3d2da 100644
--- a/src/feeds/atom.njk
+++ b/src/feeds/atom.njk
@@ -25,6 +25,10 @@
     <id>{{ absolutePostUrl }}</id>
     <content xml:lang="{{ metadata.site.language }}" type="html">{{ post.templateContent | htmlToAbsoluteUrls(absolutePostUrl) }}</content>
     <summary>{{ post.content | excerpt }}</summary>
+    {% set filteredTags = post.data.tags | except("posts") | except("draft") %}
+    {% for tag in filteredTags %}
+      <category term="{{ tag }}" />
+    {% endfor %}
   </entry>
   {%- endfor %}
 </feed>
\ No newline at end of file
diff --git a/src/feeds/tags/atom.njk b/src/feeds/tags/atom.njk
index ee37ad5..9887e65 100644
--- a/src/feeds/tags/atom.njk
+++ b/src/feeds/tags/atom.njk
@@ -18,6 +18,7 @@ eleventyComputed:
     <name>{{ metadata.author.name }}</name>
     <uri>{{ metadata.site.url }}</uri>
   </author>
+  <category term="{{ tag }}" />
   {%- for post in collections.posts | filterBy(tag) | reverse %}
   {%- set absolutePostUrl = post.url | absoluteUrl(metadata.site.url) %}
   <entry>