diff --git a/app/appstate.py b/app/appstate.py
index 90f3d62..cc325fa 100644
--- a/app/appstate.py
+++ b/app/appstate.py
@@ -170,7 +170,7 @@ class ArchMapping:
         self.skipped = set(json_object.get("skipped", []))
 
 
-BuildStatus = Dict[str, Dict[str, Dict[str, str]]]
+BuildStatus = Dict[str, Dict[str, Dict[str, Any]]]
 
 
 class AppState:
diff --git a/app/templates/queue.html b/app/templates/queue.html
index f8e422f..810c192 100644
--- a/app/templates/queue.html
+++ b/app/templates/queue.html
@@ -49,7 +49,7 @@
             <td>→</td>
             <td class="text-version">{{ srcpkg.build_version }}</td>
             <td class="mytooltip text-{{ status[0].category or 'muted' }}">
-                {{ status[0].status }}{% if status[0].url %}: <a href="{{ status[0].url }}">Logs</a>{% endif %}
+                {{ status[0].status }}{% if status[0].urls %}{% for key, value in status[0].urls.items() %} - <a href="{{ status[0].urls[key] }}">{{ key }}</a>{% endfor %}{% endif %}
                 <template class="mytooltip-content">
                     <dl>
                     {% for s in status %}
diff --git a/app/web.py b/app/web.py
index 4df4712..3e4f508 100644
--- a/app/web.py
+++ b/app/web.py
@@ -42,7 +42,7 @@ PackageBuildStatus = NamedTuple('PackageBuildStatus', [
     ('type', str),
     ('status', str),
     ('details', str),
-    ('url', str),
+    ('urls', Dict[str, str]),
     ('category', str),
 ])
 
@@ -364,14 +364,14 @@ def get_build_status(srcinfo: SrcInfoPackage) -> List[PackageBuildStatus]:
         results.append(
             PackageBuildStatus(
                 build_type, get_status_text(status_key),
-                status.get("desc", ""), status.get("url", ""),
+                status.get("desc", ""), status.get("urls", {}),
                 get_status_category(status_key))
         )
 
     if not results:
         key = "unknown"
         results.append(
-            PackageBuildStatus(key, get_status_text(key), "", "", get_status_category(key)))
+            PackageBuildStatus(key, get_status_text(key), "", {}, get_status_category(key)))
 
     return results