diff --git a/index.md b/index.md
index 82113ffe..bd0f2e92 100644
--- a/index.md
+++ b/index.md
@@ -4,7 +4,12 @@ This is the collection of all linux related documentation
 
 
 ## Issues / Tickets / Tasks
-https://jira.psi.ch/projects/PSILINUX/summary
+|||
+|---|---|
+| __User Issues__ | https://css.psi.ch |
+| __Linux Engineering__ | https://jira.psi.ch/projects/PSILINUX |
+
+
 
 ## Communication
 
@@ -18,6 +23,15 @@ __linux@psi.ch__
 This is a mailing list for incoming messages and/or for internal discussion. This list (it is a Outlook/Exchange managed distribution list) only contains the people that are regarded as the core team. If you want to be part of that team, drop an email stating so to this list!
 
 
+## Documentation / Knowledgebase
+Check out the resources on this page for PSI specific Linux documentation.
+
+From within the PSI network you can have access to the redhat.com troubleshooting and knowledge base (https://access.redhat.com) with the following credentials: 
+
+    Login: kbaccess
+    Passwort: Kb4cc3ss
+
+
 ## Linux Meetings
 
 ### Weekly Sync Meeting
diff --git a/infrastructure-guide/infrastructure_systems.md b/infrastructure-guide/infrastructure_systems.md
index 3910460f..e611cb0f 100644
--- a/infrastructure-guide/infrastructure_systems.md
+++ b/infrastructure-guide/infrastructure_systems.md
@@ -38,14 +38,6 @@ __Enduser Systems__
 ![](overview_linux.drawio.svg)
 
 
-## Misc
-
-There is a keepass file with passwords (Heinz or Edgar)
-
-Access to the redhat.com knowledge base:
-
-    Login: kbaccess
-    Passwort: Kb4cc3ss
 
 ## Metrics
 * [Overview Infrastructure](https://metrics.psi.ch/d/1SL13Nxmz/gfa-linux-tabular?orgId=1&from=now-6h&to=now&refresh=30s&var-env=telegraf_pli&var-host=boot00.psi.ch&var-host=influx00.psi.ch&var-host=lxweb00.psi.ch&var-host=metrics00.psi.ch&var-host=puppet01.psi.ch&var-host=pxeserv01.psi.ch&var-host=repo00.psi.ch&var-host=reposync.psi.ch)