diff --git a/docs/updates/index.md b/docs/updates/index.md
index 96ad0b59a9d2c44fea19e0b6293467970097476f..e1389d7fe41f6f2ab183f30d51c70b999b9c7910 100644
--- a/docs/updates/index.md
+++ b/docs/updates/index.md
@@ -1,5 +1,11 @@
 # System updates
 
+## CentOS Stream 8 (CS8)
+
+* [Updates/Errata](/updates/cs8/prod/latest_updates)
+* [TEST Updates/Errata](/updates/cs8/test/latest_updates)
+* [Software repositories](/updates/cs8/)
+
 ## CentOS 8 (C8)
 
 * [Updates/Errata](/updates/c8/prod/latest_updates)
diff --git a/mkdocs.yml b/mkdocs.yml
index 49258734264b3d812f0fe9ad683f4aaeb39cb67d..923d124b31db13d56b36e0a463fa956f9afc2ce1 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -36,6 +36,14 @@ markdown_extensions:
 plugins:
   - updates-autogeneration-plugin:
       autogenerate_path:
+        - AUTOGENERATE_CS8_PROD:
+            section_name: Production
+            path: updates/cs8/prod/
+            template_path: updates/cs8/prod.tpl
+        - AUTOGENERATE_CS8_TEST:
+            section_name: Testing
+            path: updates/cs8/test/
+            template_path: updates/cs8/test.tpl
         - AUTOGENERATE_C8_PROD:
             section_name: Production
             path: updates/c8/prod/
@@ -103,6 +111,10 @@ nav:
             - 'AIMS2 Client': installation/aims/aims2client.md
     - 'Updates':
         # These MkDocs Links will be replaced by autogenerated sections by the plugin
+        - CS8:
+            - 'Software repositories': updates/cs8/index.md
+            - AUTOGENERATE_CS8_PROD
+            - AUTOGENERATE_CS8_TEST
         - C8:
             - 'Software repositories': updates/c8/index.md
             - AUTOGENERATE_C8_PROD