diff --git a/audit/internal/webui/api.go b/audit/internal/webui/api.go
index 1b264d3..5fb23fc 100644
--- a/audit/internal/webui/api.go
+++ b/audit/internal/webui/api.go
@@ -428,26 +428,6 @@ func (h *handler) handleAPIExportList(w http.ResponseWriter, r *http.Request) {
 	writeJSON(w, entries)
 }
 
-func (h *handler) handleAPIExportBundle(w http.ResponseWriter, r *http.Request) {
-	if globalQueue.hasActiveTarget("support-bundle") {
-		writeError(w, http.StatusConflict, "support bundle task is already pending or running")
-		return
-	}
-	t := &Task{
-		ID:        newJobID("support-bundle"),
-		Name:      "Support Bundle",
-		Target:    "support-bundle",
-		Status:    TaskPending,
-		CreatedAt: time.Now(),
-	}
-	globalQueue.enqueue(t)
-	writeJSON(w, map[string]string{
-		"status":  "queued",
-		"task_id": t.ID,
-		"job_id":  t.ID,
-		"url":     "/export/support.tar.gz",
-	})
-}
 
 func (h *handler) handleAPIExportUSBTargets(w http.ResponseWriter, _ *http.Request) {
 	if h.opts.App == nil {
diff --git a/audit/internal/webui/api_test.go b/audit/internal/webui/api_test.go
index 3a15f25..d324204 100644
--- a/audit/internal/webui/api_test.go
+++ b/audit/internal/webui/api_test.go
@@ -1,7 +1,6 @@
 package webui
 
 import (
-	"encoding/json"
 	"net/http/httptest"
 	"strings"
 	"testing"
@@ -65,42 +64,6 @@ func TestHandleAPISATRunDecodesBodyWithoutContentLength(t *testing.T) {
 	}
 }
 
-func TestHandleAPIExportBundleQueuesTask(t *testing.T) {
-	globalQueue.mu.Lock()
-	originalTasks := globalQueue.tasks
-	globalQueue.tasks = nil
-	globalQueue.mu.Unlock()
-	t.Cleanup(func() {
-		globalQueue.mu.Lock()
-		globalQueue.tasks = originalTasks
-		globalQueue.mu.Unlock()
-	})
-
-	h := &handler{opts: HandlerOptions{ExportDir: t.TempDir()}}
-	req := httptest.NewRequest("POST", "/api/export/bundle", nil)
-	rec := httptest.NewRecorder()
-
-	h.handleAPIExportBundle(rec, req)
-
-	if rec.Code != 200 {
-		t.Fatalf("status=%d body=%s", rec.Code, rec.Body.String())
-	}
-	var body map[string]string
-	if err := json.Unmarshal(rec.Body.Bytes(), &body); err != nil {
-		t.Fatalf("decode response: %v", err)
-	}
-	if body["task_id"] == "" {
-		t.Fatalf("missing task_id in response: %v", body)
-	}
-	globalQueue.mu.Lock()
-	defer globalQueue.mu.Unlock()
-	if len(globalQueue.tasks) != 1 {
-		t.Fatalf("tasks=%d want 1", len(globalQueue.tasks))
-	}
-	if got := globalQueue.tasks[0].Target; got != "support-bundle" {
-		t.Fatalf("target=%q want support-bundle", got)
-	}
-}
 
 func TestPushFanRingsTracksByNameAndCarriesForwardMissingSamples(t *testing.T) {
 	h := &handler{}
diff --git a/audit/internal/webui/pages.go b/audit/internal/webui/pages.go
index 136ee2f..7818fc3 100644
--- a/audit/internal/webui/pages.go
+++ b/audit/internal/webui/pages.go
@@ -1178,73 +1178,46 @@ func listExportFiles(exportDir string) ([]string, error) {
 }
 
 func renderSupportBundleInline() string {
-	return `<button id="support-bundle-btn" class="btn btn-primary" onclick="supportBundleBuild()">Build Support Bundle</button>
-<a id="support-bundle-download" class="btn btn-secondary" href="/export/support.tar.gz" style="display:none">&#8595; Download Support Bundle</a>
-<div id="support-bundle-status" style="margin-top:12px;font-size:13px;color:var(--muted)">No support bundle built in this session.</div>
-<div id="support-bundle-log" class="terminal" style="display:none;margin-top:12px;max-height:260px"></div>
+	return `<button id="support-bundle-btn" class="btn btn-primary" onclick="supportBundleDownload()">&#8595; Download Support Bundle</button>
+<div id="support-bundle-status" style="margin-top:10px;font-size:13px;color:var(--muted)"></div>
 <script>
-(function(){
-var _supportBundleES = null;
-window.supportBundleBuild = function() {
+window.supportBundleDownload = function() {
   var btn = document.getElementById('support-bundle-btn');
   var status = document.getElementById('support-bundle-status');
-  var log = document.getElementById('support-bundle-log');
-  var download = document.getElementById('support-bundle-download');
-  if (_supportBundleES) {
-    _supportBundleES.close();
-    _supportBundleES = null;
-  }
   btn.disabled = true;
   btn.textContent = 'Building...';
-  status.textContent = 'Queueing support bundle task...';
+  status.textContent = 'Collecting logs and export data\u2026';
   status.style.color = 'var(--muted)';
-  log.style.display = '';
-  log.textContent = '';
-  download.style.display = 'none';
-
-  fetch('/api/export/bundle', {method:'POST'}).then(function(r){
-    return r.json().then(function(j){
-      if (!r.ok) throw new Error(j.error || r.statusText);
-      return j;
-    });
-  }).then(function(data){
-    if (!data.task_id) throw new Error('missing task id');
-    status.textContent = 'Building support bundle...';
-    _supportBundleES = new EventSource('/api/tasks/' + data.task_id + '/stream');
-    _supportBundleES.onmessage = function(e) {
-      log.textContent += e.data + '\n';
-      log.scrollTop = log.scrollHeight;
-    };
-    _supportBundleES.addEventListener('done', function(e) {
-      _supportBundleES.close();
-      _supportBundleES = null;
-      btn.disabled = false;
-      btn.textContent = 'Build Support Bundle';
-      if (e.data) {
-        status.textContent = 'Error: ' + e.data;
-        status.style.color = 'var(--crit-fg)';
-        return;
-      }
-      status.textContent = 'Support bundle ready.';
+  var filename = 'bee-support.tar.gz';
+  fetch('/export/support.tar.gz')
+    .then(function(r) {
+      if (!r.ok) throw new Error('HTTP ' + r.status);
+      var cd = r.headers.get('Content-Disposition') || '';
+      var m = cd.match(/filename="?([^";]+)"?/);
+      if (m) filename = m[1];
+      return r.blob();
+    })
+    .then(function(blob) {
+      var url = URL.createObjectURL(blob);
+      var a = document.createElement('a');
+      a.href = url;
+      a.download = filename;
+      document.body.appendChild(a);
+      a.click();
+      document.body.removeChild(a);
+      URL.revokeObjectURL(url);
+      status.textContent = 'Download started.';
       status.style.color = 'var(--ok-fg)';
-      download.style.display = '';
-    });
-    _supportBundleES.onerror = function() {
-      if (_supportBundleES) _supportBundleES.close();
-      _supportBundleES = null;
-      btn.disabled = false;
-      btn.textContent = 'Build Support Bundle';
-      status.textContent = 'Support bundle stream disconnected.';
+    })
+    .catch(function(e) {
+      status.textContent = 'Error: ' + e.message;
       status.style.color = 'var(--crit-fg)';
-    };
-  }).catch(function(e){
-    btn.disabled = false;
-    btn.textContent = 'Build Support Bundle';
-    status.textContent = 'Error: ' + e;
-    status.style.color = 'var(--crit-fg)';
-  });
+    })
+    .finally(function() {
+      btn.disabled = false;
+      btn.textContent = '\u2195 Download Support Bundle';
+    });
 };
-})();
 </script>`
 }
 
diff --git a/audit/internal/webui/server.go b/audit/internal/webui/server.go
index d9d022b..d33d38d 100644
--- a/audit/internal/webui/server.go
+++ b/audit/internal/webui/server.go
@@ -261,7 +261,6 @@ func NewHandler(opts HandlerOptions) http.Handler {
 
 	// Export
 	mux.HandleFunc("GET /api/export/list", h.handleAPIExportList)
-	mux.HandleFunc("POST /api/export/bundle", h.handleAPIExportBundle)
 	mux.HandleFunc("GET /api/export/usb", h.handleAPIExportUSBTargets)
 	mux.HandleFunc("POST /api/export/usb/audit", h.handleAPIExportUSBAudit)
 	mux.HandleFunc("POST /api/export/usb/bundle", h.handleAPIExportUSBBundle)
@@ -386,15 +385,12 @@ func (h *handler) handleRuntimeHealthJSON(w http.ResponseWriter, r *http.Request
 }
 
 func (h *handler) handleSupportBundleDownload(w http.ResponseWriter, r *http.Request) {
-	archive, err := app.LatestSupportBundlePath()
+	archive, err := app.BuildSupportBundle(h.opts.ExportDir)
 	if err != nil {
-		if errors.Is(err, os.ErrNotExist) {
-			http.Error(w, "support bundle not built yet", http.StatusNotFound)
-			return
-		}
-		http.Error(w, fmt.Sprintf("locate support bundle: %v", err), http.StatusInternalServerError)
+		http.Error(w, fmt.Sprintf("build support bundle: %v", err), http.StatusInternalServerError)
 		return
 	}
+	defer os.Remove(archive)
 	w.Header().Set("Cache-Control", "no-store")
 	w.Header().Set("Content-Type", "application/gzip")
 	w.Header().Set("Content-Disposition", fmt.Sprintf("attachment; filename=%q", filepath.Base(archive)))