diff --git a/index.md b/index.md
index 82c3e7df..b9361838 100644
--- a/index.md
+++ b/index.md
@@ -9,9 +9,9 @@ In first order, contact your associated Controls Expert for inquiries.
 ## Issues / Tickets / Tasks
 
 - __General User Issues:__ [PSI Customer Self Service Portal (CSS/SNow)](https://css.psi.ch)
-- __Integration & Support for Photon Science__ (Beamlines / Endstations) [Jira: Task](https://psich.atlassian.net/secure/CreateIssue.jspa?issuetype=10013&pid=10047)
-- __Integration & Support for Large Research Facilities__ (Machine Part) [Jira: Task](https://psich.atlassian.net/secure/CreateIssue.jspa?issuetype=10013&pid=10051)
-- __Controls supported Infrastructure__ (2nd level) [Jira: CTRLIT Task](https://psich.atlassian.net/secure/CreateIssue.jspa?issuetype=10013&pid=10157)
+- __Integration & Support for Photon Science__ (Beamlines / Endstations) - Create Jira: [Task](https://psich.atlassian.net/secure/CreateIssue.jspa?issuetype=10013&pid=10047) | [Bug](https://psich.atlassian.net/secure/CreateIssue.jspa?issuetype=10011&pid=10047) :octicons-bug-24:
+- __Integration & Support for Large Research Facilities__ (Machine Part) - Create Jira: [Task](https://psich.atlassian.net/secure/CreateIssue.jspa?issuetype=10013&pid=10051) | [Task](https://psich.atlassian.net/secure/CreateIssue.jspa?issuetype=10011&pid=10051)
+- __Controls supported Infrastructure__ (2nd level) - Create Jira: [CTRLIT Task](https://psich.atlassian.net/secure/CreateIssue.jspa?issuetype=10013&pid=10157) | [CTRLIT Task](https://psich.atlassian.net/secure/CreateIssue.jspa?issuetype=10011&pid=10157)
 
 ## Documentation / Knowledgebase
 ### Machine