diff --git a/routers/admin_geraete.py b/routers/admin_geraete.py
index 381355c..8dfe7a8 100644
--- a/routers/admin_geraete.py
+++ b/routers/admin_geraete.py
@@ -114,3 +114,23 @@ def auftrag_deselect(device_id: str, merkmal_key: str, user: dict = Depends(requ
     )
 
     return RedirectResponse(f"/admin/geraete/{device_id}", status_code=303)
+
+
+@router.post("/{device_id}/debug-modus/aktivieren")
+def debug_modus_aktivieren(device_id: str, user: dict = Depends(require_admin)):
+    if find_device(device_id) is None:
+        raise HTTPException(status_code=404, detail="Gerät wurde nicht gefunden.")
+
+    anode_request("POST", f"/api/v1/devices/{device_id}/debug-mode")
+
+    return RedirectResponse(f"/admin/geraete/{device_id}", status_code=303)
+
+
+@router.post("/{device_id}/debug-modus/deaktivieren")
+def debug_modus_deaktivieren(device_id: str, user: dict = Depends(require_admin)):
+    if find_device(device_id) is None:
+        raise HTTPException(status_code=404, detail="Gerät wurde nicht gefunden.")
+
+    anode_request("DELETE", f"/api/v1/devices/{device_id}/debug-mode")
+
+    return RedirectResponse(f"/admin/geraete/{device_id}", status_code=303)
diff --git a/routers/geraete.py b/routers/geraete.py
index 6ceb877..5d6e567 100644
--- a/routers/geraete.py
+++ b/routers/geraete.py
@@ -203,6 +203,26 @@ def auftrag_deselect(device_id: str, merkmal_key: str, user: dict = Depends(get_
     return RedirectResponse(f"/geraete/{device_id}", status_code=303)
 
 
+@router.post("/geraete/{device_id}/debug-modus/aktivieren")
+def debug_modus_aktivieren(device_id: str, user: dict = Depends(get_current_user)):
+    if find_device_in_organization(device_id, user.organization_id) is None:
+        raise HTTPException(status_code=404, detail="Gerät wurde nicht gefunden.")
+
+    anode_request("POST", f"/api/v1/devices/{device_id}/debug-mode")
+
+    return RedirectResponse(f"/geraete/{device_id}", status_code=303)
+
+
+@router.post("/geraete/{device_id}/debug-modus/deaktivieren")
+def debug_modus_deaktivieren(device_id: str, user: dict = Depends(get_current_user)):
+    if find_device_in_organization(device_id, user.organization_id) is None:
+        raise HTTPException(status_code=404, detail="Gerät wurde nicht gefunden.")
+
+    anode_request("DELETE", f"/api/v1/devices/{device_id}/debug-mode")
+
+    return RedirectResponse(f"/geraete/{device_id}", status_code=303)
+
+
 @router.get("/geraete/{device_id}/hardware")
 def hardware_ansicht(request: Request, device_id: str, user: dict = Depends(get_current_user)):
     device = find_device_in_organization(device_id, user.organization_id)
diff --git a/templates/admin/geraete_liste.html b/templates/admin/geraete_liste.html
index b337dc7..eb068e9 100644
--- a/templates/admin/geraete_liste.html
+++ b/templates/admin/geraete_liste.html
@@ -17,7 +17,7 @@
             <td>{{ device.hostname or "—" }}</td>
             <td><code>{{ device.device_fingerprint }}</code></td>
             <td>{{ device.oe_name or "—" }}</td>
-            <td>{{ device.agent_last_checkin or "noch nie" }}</td>
+            <td>{{ device.agent_last_checkin or "noch nie" }}{% if device.debug_mode_until %}<br><small>🐞 Debug-Modus aktiv</small>{% endif %}</td>
             <td><a href="/admin/geraete/{{ device.id }}" role="button" class="outline">Auftragskatalog →</a></td>
             <td>
                 <form method="post" action="/admin/geraete/{{ device.id }}/oe">
diff --git a/templates/auftragskatalog.html b/templates/auftragskatalog.html
index 79e6932..e6dc943 100644
--- a/templates/auftragskatalog.html
+++ b/templates/auftragskatalog.html
@@ -4,6 +4,20 @@
 <p><a href="{{ zurueck_url }}">← Geräteliste</a></p>
 <h2>Auftragskatalog: {{ device.hostname or device.device_fingerprint }}</h2>
 
+<section>
+    <h3>Debug-Modus</h3>
+    {% if device.debug_mode_until %}
+        <p>Aktiv bis {{ device.debug_mode_until }} (kurzes Poll-Intervall, fällt danach automatisch auf den Standard zurück).</p>
+        <form method="post" action="{{ zurueck_url }}/{{ device.id }}/debug-modus/deaktivieren">
+            <button type="submit" class="secondary outline">Debug-Modus jetzt beenden</button>
+        </form>
+    {% else %}
+        <form method="post" action="{{ zurueck_url }}/{{ device.id }}/debug-modus/aktivieren">
+            <button type="submit" class="secondary outline">Debug-Modus aktivieren (6 Stunden)</button>
+        </form>
+    {% endif %}
+</section>
+
 {% if fehler %}
     <p><mark>{{ fehler }}</mark></p>
 {% else %}
diff --git a/templates/geraete_hardware.html b/templates/geraete_hardware.html
index df26ed8..730462d 100644
--- a/templates/geraete_hardware.html
+++ b/templates/geraete_hardware.html
@@ -4,6 +4,23 @@
 <p><a href="/geraete">← Geräteliste</a></p>
 <h2>Hardware-Informationen: {{ device.hostname or device.device_fingerprint }}</h2>
 
+{% if device.health %}
+<section>
+    <h3>Aktueller Zustand (letzter Checkin)</h3>
+    <figure>
+    <table>
+        <tbody>
+            <tr><td>Diskbelegung (/)</td><td>{{ device.health.disk_used_percent ~ "%" if device.health.disk_used_percent is not none else "—" }}</td></tr>
+            <tr><td>RAM-Auslastung</td><td>{{ device.health.ram_used_percent ~ "%" if device.health.ram_used_percent is not none else "—" }}</td></tr>
+            <tr><td>Uptime</td><td>{{ (device.health.uptime_seconds / 3600) | round(1) ~ " h" if device.health.uptime_seconds is not none else "—" }}</td></tr>
+            <tr><td>Load Average (1/5/15 Min)</td><td>{{ device.health.load_1m ~ " / " ~ device.health.load_5m ~ " / " ~ device.health.load_15m if device.health.load_1m is not none else "—" }}</td></tr>
+            <tr><td>Stand</td><td>{{ device.health.collected_at }}</td></tr>
+        </tbody>
+    </table>
+    </figure>
+</section>
+{% endif %}
+
 {% if fehler %}
     <p><mark>{{ fehler }}</mark></p>
 {% elif not hardware %}
diff --git a/templates/geraete_liste.html b/templates/geraete_liste.html
index 162479c..11f820f 100644
--- a/templates/geraete_liste.html
+++ b/templates/geraete_liste.html
@@ -24,6 +24,7 @@
                 {% else %}
                 <span class="state-present">aktiv</span>
                 {% endif %}
+                {% if device.debug_mode_until %}<br><small>🐞 Debug-Modus aktiv</small>{% endif %}
             </td>
             <td><a href="/geraete/{{ device.id }}" role="button" class="outline">Auftragskatalog →</a></td>
             <td>
diff --git a/templates/geraete_log.html b/templates/geraete_log.html
index 2cfa98e..9335db5 100644
--- a/templates/geraete_log.html
+++ b/templates/geraete_log.html
@@ -4,6 +4,8 @@
 <p><a href="/geraete">← Geräteliste</a></p>
 <h2>Installations-/Aktions-Log: {{ device.hostname or device.device_fingerprint }}</h2>
 
+<p>Zuletzt gemeldet: {{ device.agent_last_checkin or "noch nie" }}</p>
+
 {% if not events %}
     <p>Für dieses Gerät liegen noch keine Einträge vor.</p>
 {% else %}