diff --git a/frontend/js/ci.js b/frontend/js/ci.js
index 2ad6829de..90a904cc7 100644
--- a/frontend/js/ci.js
+++ b/frontend/js/ci.js
@@ -171,7 +171,7 @@ const getChartOptions = (runs, chart_element) => {
 
 const displayGraph = (runs) => {
     const element = createChartContainer("#chart-container", "run-energy", runs);
-    
+
     const options = getChartOptions(runs, element);
 
     const chart_instance = echarts.init(element);
@@ -241,26 +241,26 @@ const displayCITable = (runs, url_params) => {
 
         var run_link = ''
         if(source == 'github') {
-            run_link = `https://github.com/${url_params.get('repo')}/actions/runs/${run_id}`;
+            run_link = `https://github.com/${escapeString(url_params.get('repo'))}/actions/runs/${escapeString(run_id)}`;
         }
         else if (source == 'gitlab') {
-            run_link = `https://gitlab.com/${url_params.get('repo')}/-/pipelines/${run_id}`
+            run_link = `https://gitlab.com/${escapeString(url_params.get('repo'))}/-/pipelines/${escapeString(run_id)}`
         }
 
-        const run_link_node = `<a href="${run_link}" target="_blank">${run_id}</a>`
+        const run_link_node = `<a href="${run_link}" target="_blank">${escapeString(run_id)}</a>`
 
         const created_at = el[3]
 
         const label = el[4]
         const duration = el[7]
 
-        li_node.innerHTML = `<td class="td-index">${value}</td>\
-                            <td class="td-index">${label}</td>\
+        li_node.innerHTML = `<td class="td-index">${escapeString(value)}</td>\
+                            <td class="td-index">${escapeString(label)}</td>\
                             <td class="td-index">${run_link_node}</td>\
-                            <td class="td-index"><span title="${created_at}">${dateToYMD(new Date(created_at))}</span></td>\
-                            <td class="td-index" ${tooltip}>${short_hash}</td>\
-                            <td class="td-index">${cpu}</td>\
-                            <td class="td-index">${duration} seconds</td>`;
+                            <td class="td-index"><span title="${escapeString(created_at)}">${dateToYMD(new Date(created_at))}</span></td>\
+                            <td class="td-index" ${escapeString(tooltip)}>${escapeString(short_hash)}</td>\
+                            <td class="td-index">${escapeString(cpu)}</td>\
+                            <td class="td-index">${escapeString(duration)} seconds</td>`;
         document.querySelector("#ci-table").appendChild(li_node);
     });
     $('table').tablesort();
@@ -318,17 +318,17 @@ $(document).ready((e) => {
         let repo_link = ''
 
         if(badges_data.data[0][8] == 'github') {
-            repo_link = `https://github.com/${url_params.get('repo')}`;
+            repo_link = `https://github.com/${escapeString(url_params.get('repo'))}`;
         }
         else if(badges_data.data[0][8] == 'gitlab') {
-            repo_link = `https://gitlab.com/${url_params.get('repo')}`;
+            repo_link = `https://gitlab.com/${escapeString(url_params.get('repo'))}`;
         }
         //${repo_link}
-        const repo_link_node = `<a href="${repo_link}" target="_blank">${url_params.get('repo')}</a>`
+        const repo_link_node = `<a href="${repo_link}" target="_blank">${escapeString(url_params.get('repo'))}</a>`
         document.querySelector('#ci-data').insertAdjacentHTML('afterbegin', `<tr><td><strong>Repository:</strong></td><td>${repo_link_node}</td></tr>`)
-        document.querySelector('#ci-data').insertAdjacentHTML('afterbegin', `<tr><td><strong>Branch:</strong></td><td>${url_params.get('branch')}</td></tr>`)
-        document.querySelector('#ci-data').insertAdjacentHTML('afterbegin', `<tr><td><strong>Workflow:</strong></td><td>${url_params.get('workflow')}</td></tr>`)
-        
+        document.querySelector('#ci-data').insertAdjacentHTML('afterbegin', `<tr><td><strong>Branch:</strong></td><td>${escapeString(url_params.get('branch'))}</td></tr>`)
+        document.querySelector('#ci-data').insertAdjacentHTML('afterbegin', `<tr><td><strong>Workflow:</strong></td><td>${escapeString(url_params.get('workflow'))}</td></tr>`)
+
         displayCITable(badges_data.data, url_params);
         chart_instance = displayGraph(badges_data.data)
         displayAveragesTable(badges_data.data)
diff --git a/frontend/js/helpers/main.js b/frontend/js/helpers/main.js
index 907a95f85..9a1dfcef5 100644
--- a/frontend/js/helpers/main.js
+++ b/frontend/js/helpers/main.js
@@ -33,18 +33,27 @@ class GMTMenu extends HTMLElement {
 customElements.define('gmt-menu', GMTMenu);
 
 const replaceRepoIcon = (uri) => {
-    if (uri.startsWith("https://www.github.com") || uri.startsWith("https://github.com")) {
-        uri = uri.replace("https://www.github.com", '<i class="icon github"></i>');
-        uri = uri.replace("https://github.com", '<i class="icon github"></i>');
-    } else if (uri.startsWith("https://www.bitbucket.com") || uri.startsWith("https://bitbucket.com")) {
-        uri = uri.replace("https://www.bitbucket.com", '<i class="icon bitbucket"></i>');
-        uri = uri.replace("https://bitbucket.com", '<i class="icon bitbucket"></i>');
-    } else if (uri.startsWith("https://www.gitlab.com") || uri.startsWith("https://gitlab.com")) {
-        uri = uri.replace("https://www.gitlab.com", '<i class="icon gitlab"></i>');
-        uri = uri.replace("https://gitlab.com", '<i class="icon gitlab"></i>');
-    }
-    return uri;
-}
+  const url = new URL(uri);
+  let iconClass = "";
+
+  switch (url.host) {
+    case "github.com":
+    case "www.github.com":
+      iconClass = "github";
+      break;
+    case "bitbucket.com":
+    case "www.bitbucket.com":
+      iconClass = "bitbucket";
+      break;
+    case "gitlab.com":
+    case "www.gitlab.com":
+      iconClass = "gitlab";
+      break;
+    default:
+      return uri;
+  }
+  return `<i class="icon ${iconClass}"></i>` + uri.substring(url.origin.length);
+};
 
 const showNotification = (message_title, message_text, type='warning') => {
     $('body')