diff --git a/_toc.yml b/_toc.yml
index 9dafac5d..fb139dc5 100644
--- a/_toc.yml
+++ b/_toc.yml
@@ -17,6 +17,7 @@ parts:
         - file: infrastructure-guide/boot00
         - file: infrastructure-guide/puppet01
         - file: infrastructure-guide/repo00
+        - file: infrastructure-guide/repo01
         - file: infrastructure-guide/reposync
         - file: infrastructure-guide/lxweb00
         - file: infrastructure-guide/login
@@ -30,12 +31,5 @@ parts:
     - file: rhel8/index
       sections:
         - file: rhel8/installation
-        - file: rhel8/configuration
         - file: rhel8/vendor_documentation
-        - file: rhel8/design_guiding_principles
 
-- caption: RHEL8 Guides (Beta)
-  chapters:
-    - file: rhel8-guides-beta/developer_guide
-    - file: rhel8-guides-beta/installation_guide
-    - file: rhel8-guides-beta/admin_guide
diff --git a/rhel8/index.md b/rhel8/index.md
index 76397764..25613f06 100644
--- a/rhel8/index.md
+++ b/rhel8/index.md
@@ -3,7 +3,7 @@ title: RHEL-8
 description: PSI Red Hat Enterprise Linux 8
 lead: ""
 date: 2020-10-06T08:48:23+00:00
-lastmod: 2020-10-06T08:48:23+00:00
+lastmod: 2022-05-10T11:13:00+00:00
 draft: false
 images: []
 toc: true
@@ -13,12 +13,15 @@ toc: true
 The current stateof RHEL 8 support is very alpha. It is possible to install a system and install packages provided by Red Hat.
 Configuration works like for RHEL 7 with Puppet. 
 
-It looks like it works already a lot out of the box, but no guarantee can be given unless your specfic setup has been tested.
+## Testing
+
+It looks like it works already a lot out of the box, but no guarantee can be given unless your specfic setup has been tested. The epic [RHEL 8.5 Alpha Test](https://jira.psi.ch/browse/PSILINUX-93) lists the currently knowns issues. Please add your bugs there too.
+
+### Major Known Issues
+- [AFS not yet working](https://jira.psi.ch/browse/PSILINUX-94)
+- [Icinga monitoring not yet working](https://jira.psi.ch/browse/PSILINUX-95)
+
+## Documenatation
 
 * [Installation (Alpha)](installation)
 * [Vendor Documentation](vendor_documentation)
-
-
-## Known Issues
-- AFS not yet working
-- Icinga monitoring not yet working