diff --git a/.gitignore b/.gitignore
index 0a915883..6e7e2975 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,6 @@ dist/
 # NPM
 server/frontend/node_modules
 server/frontend/dist
+
+# Git worktrees
+.worktrees/
diff --git a/server/frontend/src/components/Buckets/HideBucketBtn.vue b/server/frontend/src/components/Buckets/HideBucketBtn.vue
deleted file mode 100644
index 6acd3cd5..00000000
--- a/server/frontend/src/components/Buckets/HideBucketBtn.vue
+++ /dev/null
@@ -1,50 +0,0 @@
-<template>
-  <a class="btn btn-default" @click="link">Mark triaged</a>
-</template>
-
-<script>
-import swal from "sweetalert";
-import { h, ref, render } from "vue";
-import { errorParser, hideBucketUntil } from "../../helpers";
-import HideBucketBtnForm from "./HideBucketBtnForm.vue";
-
-export default {
-  props: {
-    bucket: {
-      type: Number,
-      default: null,
-      required: true,
-    },
-  },
-  methods: {
-    async link() {
-      const selectedTime = ref(null);
-      const container = document.createElement("div");
-
-      const formCtor = h(HideBucketBtnForm, {
-        onUpdateTime: (time) => (selectedTime.value = time),
-      });
-
-      render(formCtor, container);
-
-      const value = await swal({
-        title: "Mark bucket triaged",
-        content: container,
-        buttons: true,
-      });
-
-      if (value) {
-        try {
-          const data = await hideBucketUntil(
-            this.bucket,
-            new Date(Date.now() + selectedTime.value * 7 * 24 * 60 * 60 * 1000),
-          );
-          window.location.href = data.url;
-        } catch (err) {
-          swal("Oops", errorParser(err), "error");
-        }
-      }
-    },
-  },
-};
-</script>
diff --git a/server/frontend/src/components/Buckets/HideBucketBtnForm.vue b/server/frontend/src/components/Buckets/HideBucketBtnForm.vue
deleted file mode 100644
index 9968bf92..00000000
--- a/server/frontend/src/components/Buckets/HideBucketBtnForm.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-<template>
-  <div>
-    <p>
-      This will hide the bucket from the default view for the specified number
-      of weeks.
-    </p>
-    <p>
-      Incoming reports matching the signature will still be put in this bucket.
-    </p>
-    <div class="table">
-      <div class="tr">
-        <label class="td" for="weeks">Weeks</label>
-        <input
-          id="id_weeks"
-          v-model="selectedTime"
-          class="td"
-          type="number"
-          min="1"
-          max="12"
-          @change="$emit('update-time', selectedTime)"
-        />
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { onMounted, ref } from "vue";
-
-export default {
-  setup(props, context) {
-    const selectedTime = ref(1);
-
-    onMounted(() => {
-      context.emit("update-time", selectedTime.value);
-    });
-
-    return {
-      selectedTime,
-    };
-  },
-};
-</script>
-
-<style scoped>
-p {
-  text-align: left;
-}
-.table {
-  display: table;
-}
-.tr {
-  display: table-row;
-  text-align: left;
-}
-.td {
-  display: table-cell;
-  padding: 8px;
-}
-</style>
diff --git a/server/frontend/src/components/Buckets/List.vue b/server/frontend/src/components/Buckets/List.vue
index c62b941b..ed30afee 100644
--- a/server/frontend/src/components/Buckets/List.vue
+++ b/server/frontend/src/components/Buckets/List.vue
@@ -18,6 +18,7 @@
           <button
             type="button"
             class="btn btn-default"
+            data-testid="show-triaged-toggle"
             :disabled="loading"
             @click="updateShowHidden"
           >
@@ -293,7 +294,7 @@ export default {
       pageSize: 100,
       queryError: "",
       queryStr: JSON.stringify(
-        { op: "AND", bug__isnull: true, hide_until__isnull: true },
+        { op: "AND", bug__isnull: true, triage_status__isnull: true },
         null,
         2,
       ),
@@ -325,7 +326,7 @@ export default {
       return !this.queryStr.includes('"bug__isnull": true');
     },
     showHidden() {
-      return !this.queryStr.includes('"hide_until__isnull": true');
+      return !this.queryStr.includes('"triage_status__isnull": true');
     },
   },
   created() {
@@ -385,7 +386,7 @@ export default {
       if (this.showHidden) {
         this.queryStr = JSON.stringify(
           Object.assign(
-            { hide_until__isnull: true },
+            { triage_status__isnull: true },
             JSON.parse(this.queryStr),
           ),
           null,
@@ -393,7 +394,7 @@ export default {
         );
       } else {
         const query = JSON.parse(this.queryStr);
-        delete query["hide_until__isnull"];
+        delete query["triage_status__isnull"];
         this.queryStr = JSON.stringify(query, null, 2);
       }
       this.fetch();
diff --git a/server/frontend/src/components/Buckets/TriageBucketDropdown.vue b/server/frontend/src/components/Buckets/TriageBucketDropdown.vue
new file mode 100644
index 00000000..18bc36e1
--- /dev/null
+++ b/server/frontend/src/components/Buckets/TriageBucketDropdown.vue
@@ -0,0 +1,214 @@
+<template>
+  <div class="triage-bucket-dropdown">
+    <a class="btn btn-default" data-testid="triage-trigger" @click="showPanel">
+      {{ currentStatus ? "Change triage status" : "Mark triaged" }}
+    </a>
+
+    <div v-if="isPanelVisible" class="triage-panel" data-testid="triage-panel">
+      <div class="panel-header">Select status</div>
+      <div class="panel-options">
+        <a
+          v-for="choice in choices"
+          :key="choice.value"
+          class="panel-option"
+          :class="{ 'panel-option--selected': choice.value === currentStatus }"
+          :data-testid="`triage-option-${choice.value}`"
+          @click="choice.value !== currentStatus && selectStatus(choice.value)"
+        >
+          <span class="option-rail"></span>
+          <span class="option-label">{{ choice.label }}</span>
+          <span v-if="choice.value === currentStatus" class="option-check"
+            >✓</span
+          >
+        </a>
+      </div>
+      <div v-if="currentStatus" class="panel-danger-zone">
+        <a
+          class="panel-option panel-option--unmark"
+          data-testid="triage-unmark"
+          @click="selectStatus(null)"
+        >
+          <span class="option-rail"></span>
+          <span class="option-label">Unmark triaged</span>
+        </a>
+      </div>
+      <div class="panel-footer">
+        <a class="panel-cancel" @click="hidePanel">Cancel</a>
+      </div>
+    </div>
+
+    <div v-if="isPanelVisible" class="panel-backdrop" @click="hidePanel"></div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "TriageBucketDropdown",
+  props: {
+    bucketId: {
+      type: Number,
+      required: true,
+    },
+    currentStatus: {
+      type: String,
+      default: null,
+    },
+    choices: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  emits: ["update"],
+  data() {
+    return {
+      isPanelVisible: false,
+    };
+  },
+  methods: {
+    showPanel() {
+      this.isPanelVisible = true;
+    },
+    hidePanel() {
+      this.isPanelVisible = false;
+    },
+    selectStatus(status) {
+      this.isPanelVisible = false;
+      this.$emit("update", status);
+    },
+  },
+};
+</script>
+
+<style scoped>
+.triage-bucket-dropdown {
+  display: inline-block;
+  position: relative;
+}
+
+.triage-panel {
+  position: absolute;
+  top: calc(100% + 5px);
+  left: 0;
+  background: #fff;
+  border: 1px solid #ccc;
+  border-radius: 5px;
+  z-index: 1000;
+  min-width: 210px;
+  overflow: hidden;
+}
+
+.panel-header {
+  background: #fafafa;
+  padding: 9px 14px 8px;
+  border-bottom: 1px solid #eee;
+  font-weight: bold;
+}
+
+.panel-options {
+  padding: 4px 0;
+}
+
+.panel-option {
+  display: flex;
+  align-items: center;
+  padding: 0;
+  cursor: pointer;
+  color: #333;
+  text-decoration: none;
+}
+
+.panel-option:hover {
+  background-color: #f7f7f7;
+  text-decoration: none;
+  color: #333;
+}
+
+.option-rail {
+  display: block;
+  width: 3px;
+  align-self: stretch;
+  background-color: transparent;
+  flex-shrink: 0;
+  border-radius: 0 2px 2px 0;
+}
+
+.panel-option:hover .option-rail {
+  background-color: #ccc;
+}
+
+.panel-option--selected .option-rail {
+  background-color: #0066cc;
+}
+
+.option-label {
+  flex: 1;
+  padding: 8px 12px 8px 10px;
+  font-size: 13px;
+  line-height: 1.3;
+}
+
+.option-check {
+  padding-right: 12px;
+  font-size: 11px;
+  color: #0066cc;
+  font-weight: 700;
+}
+
+.panel-option--selected {
+  background-color: #f0f6ff;
+  cursor: default;
+  pointer-events: none;
+}
+
+.panel-option--selected .option-label {
+  color: #0055aa;
+  font-weight: 600;
+}
+
+.panel-danger-zone {
+  border-top: 1px solid #eee;
+}
+
+.panel-option--unmark .option-label {
+  color: #c0392b;
+}
+
+.panel-option--unmark:hover {
+  background-color: #fdf4f3;
+}
+
+.panel-option--unmark:hover .option-rail {
+  background-color: #c0392b;
+}
+
+.panel-option--unmark:hover .option-label {
+  color: #a93226;
+}
+
+.panel-footer {
+  padding: 7px 14px;
+  border-top: 1px solid #eee;
+  text-align: right;
+  background: #fafafa;
+}
+
+.panel-cancel {
+  color: #999;
+  cursor: pointer;
+  text-decoration: none;
+}
+
+.panel-cancel:hover {
+  color: #555;
+  text-decoration: none;
+}
+
+.panel-backdrop {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 999;
+}
+</style>
diff --git a/server/frontend/src/components/Buckets/View.vue b/server/frontend/src/components/Buckets/View.vue
index e86a8b8a..97336941 100644
--- a/server/frontend/src/components/Buckets/View.vue
+++ b/server/frontend/src/components/Buckets/View.vue
@@ -32,19 +32,22 @@
             </td>
             <td v-else>
               No bug associated.
-              <span v-if="bucket.hide_until"
-                >Marked triaged until {{ formatDate(bucket.hide_until) }}.</span
+              <span v-if="triageStatus" data-testid="triage-status-display"
+                >Marked triaged as:
+                <strong data-testid="triage-status-label">
+                  {{ triageStatusDisplay }}
+                </strong>
+                on {{ formatDate(triagedAt) }}.</span
               >
               <br v-if="canEdit" /><br v-if="canEdit" />
               <div v-if="canEdit" class="btn-group">
                 <assignbutton :bucket="bucket.id" :providers="providers" />
-                <hidebucketbutton
-                  v-if="!bucket.hide_until"
-                  :bucket="bucket.id"
+                <TriageBucketDropdown
+                  :bucket-id="bucket.id"
+                  :current-status="triageStatus"
+                  :choices="bucket.triage_status_choices || []"
+                  @update="handleTriageStatusUpdate"
                 />
-                <a v-else class="btn btn-default" @click="unhide"
-                  >Unmark triaged</a
-                >
               </div>
               <br v-if="canEdit" /><br v-if="canEdit" />
               <div v-if="canEdit" class="btn-group">
@@ -227,9 +230,9 @@ import {
   assignExternalBug,
   date,
   errorParser,
-  hideBucketUntil,
   jsonPretty,
   parseHash,
+  updateBucketTriageStatus,
 } from "../../helpers";
 import {
   etpStrictReportDescription,
@@ -241,7 +244,7 @@ import * as api from "../../api";
 import PageNav from "../PageNav.vue";
 import ActivityGraph from "../ActivityGraph.vue";
 import AssignBtn from "./AssignBtn.vue";
-import HideBucketBtn from "./HideBucketBtn.vue";
+import TriageBucketDropdown from "./TriageBucketDropdown.vue";
 import ReportPreviewRow from "./ReportPreviewRow.vue";
 
 const pageSize = 50;
@@ -251,7 +254,7 @@ export default {
     activitygraph: ActivityGraph,
     assignbutton: AssignBtn,
     ClipLoader: LoadingSpinner,
-    hidebucketbutton: HideBucketBtn,
+    TriageBucketDropdown,
     PageNav: PageNav,
     ReportPreviewRow: ReportPreviewRow,
   },
@@ -304,6 +307,9 @@ export default {
       reports: null,
       sortKeys: [...defaultSortKeys],
       totalPages: 1,
+      triageStatus: this.bucket.triage_status,
+      triageStatusDisplay: this.bucket.triage_status_display,
+      triagedAt: this.bucket.triaged_at,
     };
   },
   computed: {
@@ -401,15 +407,6 @@ export default {
     submitWatchForm() {
       this.$refs.bucketWatchForm.submit();
     },
-    unhide() {
-      hideBucketUntil(this.bucket.id, null)
-        .then((data) => {
-          window.location.href = data.url;
-        })
-        .catch((err) => {
-          swal("Oops", errorParser(err), "error");
-        });
-    },
     unlink() {
       swal({
         title: "Unlink bug",
@@ -532,6 +529,19 @@ export default {
       searchParams.append("dependson", "tp-breakage");
       openPrefilledBugzillaBug(searchParams);
     },
+    async handleTriageStatusUpdate(newStatus) {
+      try {
+        const { bucket } = await updateBucketTriageStatus(
+          this.bucket.id,
+          newStatus,
+        );
+        this.triageStatus = bucket.triage_status;
+        this.triageStatusDisplay = bucket.triage_status_display;
+        this.triagedAt = bucket.triaged_at;
+      } catch (err) {
+        swal("Oops", errorParser(err), "error");
+      }
+    },
   },
   watch: {
     currentPage() {
diff --git a/server/frontend/src/helpers.js b/server/frontend/src/helpers.js
index 63e63668..0733b0e8 100644
--- a/server/frontend/src/helpers.js
+++ b/server/frontend/src/helpers.js
@@ -89,9 +89,9 @@ export const assignExternalBug = (bucketId, bugId, providerId) => {
   }
 };
 
-export const hideBucketUntil = (bucketId, dateObj) => {
+export const updateBucketTriageStatus = (bucketId, triageStatus) => {
   const payload = {
-    hide_until: dateObj ? dateObj.toISOString() : null,
+    triage_status: triageStatus,
   };
 
   try {
diff --git a/server/frontend/tests/buckets_list.test.js b/server/frontend/tests/buckets_list.test.js
index 2544f16f..c4aa9bd7 100644
--- a/server/frontend/tests/buckets_list.test.js
+++ b/server/frontend/tests/buckets_list.test.js
@@ -16,7 +16,7 @@ afterEach(jest.resetAllMocks);
 const defaultQueryStr = `{
   "op": "AND",
   "bug__isnull": true,
-  "hide_until__isnull": true
+  "triage_status__isnull": true
 }`;
 
 test("bucket list has no buckets", async () => {
diff --git a/server/reportmanager/cron.py b/server/reportmanager/cron.py
index b5a456eb..c9011845 100644
--- a/server/reportmanager/cron.py
+++ b/server/reportmanager/cron.py
@@ -58,14 +58,6 @@ def update_report_stats():
     ReportHit.objects.filter(last_update__lt=old_cutoff).delete()
 
 
-@app.task(ignore_result=True)
-def unhide_buckets():
-    from .models import Bucket
-
-    now = timezone.now()
-    Bucket.objects.filter(hide_until__lte=now).update(hide_until=None)
-
-
 @app.task(ignore_result=True)
 def bug_update_status():
     call_command("bug_update_status")
diff --git a/server/reportmanager/migrations/0018_add_triage_status.py b/server/reportmanager/migrations/0018_add_triage_status.py
new file mode 100644
index 00000000..bda9585f
--- /dev/null
+++ b/server/reportmanager/migrations/0018_add_triage_status.py
@@ -0,0 +1,23 @@
+# Generated by Django 6.0.4 on 2026-04-29 17:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('reportmanager', '0017_reportentry_country'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='bucket',
+            name='triage_status',
+            field=models.CharField(choices=[('worksforme', 'Works For Me'), ('cant_test', "Can't Test"), ('incomplete', 'Incomplete'), ('invalid', 'Invalid'), ('non_compat', 'Non-Compat')], max_length=20, null=True),
+        ),
+        migrations.AddField(
+            model_name='bucket',
+            name='triaged_at',
+            field=models.DateTimeField(null=True),
+        ),
+    ]
diff --git a/server/reportmanager/migrations/0019_migrate_hide_until_to_triage_status.py b/server/reportmanager/migrations/0019_migrate_hide_until_to_triage_status.py
new file mode 100644
index 00000000..48fa73e7
--- /dev/null
+++ b/server/reportmanager/migrations/0019_migrate_hide_until_to_triage_status.py
@@ -0,0 +1,41 @@
+# Generated by Django 6.0.4 on 2026-04-24 17:02
+
+from datetime import timedelta
+
+from django.db import migrations
+from django.db.models import ExpressionWrapper, F
+from django.db.models.fields import DateTimeField
+
+
+def migrate_triage_data(apps, schema_editor):
+    """Migrate hide_until data to triage_status field."""
+    Bucket = apps.get_model('reportmanager', 'Bucket')
+
+    # All currently triaged buckets (hide_until is not NULL) → 'worksforme'
+    # triaged_at is set to hide_until - 4 weeks to approximate when triage happened
+    triaged_count = Bucket.objects.filter(hide_until__isnull=False).update(
+        triage_status='worksforme',
+        triaged_at=ExpressionWrapper(
+            F('hide_until') - timedelta(weeks=4),
+            output_field=DateTimeField(),
+        ),
+    )
+
+    print(f"Migrated {triaged_count} triaged buckets to 'worksforme' status")
+
+
+def reverse_migrate(apps, schema_editor):
+    """Reverse migration - clear triage_status."""
+    Bucket = apps.get_model('reportmanager', 'Bucket')
+    Bucket.objects.all().update(triage_status=None, triaged_at=None)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('reportmanager', '0018_add_triage_status'),
+    ]
+
+    operations = [
+        migrations.RunPython(migrate_triage_data, reverse_migrate),
+    ]
diff --git a/server/reportmanager/migrations/0020_remove_hide_until.py b/server/reportmanager/migrations/0020_remove_hide_until.py
new file mode 100644
index 00000000..16c62d31
--- /dev/null
+++ b/server/reportmanager/migrations/0020_remove_hide_until.py
@@ -0,0 +1,17 @@
+# Generated by Django 6.0.4 on 2026-04-24 17:15
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('reportmanager', '0019_migrate_hide_until_to_triage_status'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='bucket',
+            name='hide_until',
+        ),
+    ]
diff --git a/server/reportmanager/models.py b/server/reportmanager/models.py
index 747f18bc..8864ded1 100644
--- a/server/reportmanager/models.py
+++ b/server/reportmanager/models.py
@@ -52,6 +52,13 @@ class BreakageCategory(models.Model):
 
 
 class Bucket(models.Model):
+    class TriageStatus(models.TextChoices):
+        WORKS_FOR_ME = "worksforme", "Works For Me"
+        CANT_TEST = "cant_test", "Can't Test"
+        INCOMPLETE = "incomplete", "Incomplete"
+        INVALID = "invalid", "Invalid"
+        NON_COMPAT = "non_compat", "Non-Compat"
+
     id: models.AutoField = models.AutoField(primary_key=True)
     bug: models.ForeignKey = models.ForeignKey(
         "Bug", null=True, on_delete=models.deletion.CASCADE
@@ -63,8 +70,10 @@ class Bucket(models.Model):
     # store the domain outside the signature only if the signature includes
     # a non-regex domain symptom and no other symptoms (for quick exclusion)
     domain: models.CharField = models.CharField(max_length=255, null=True)
-    # bucket can be hidden from view until given date, without being logged
-    hide_until: models.DateTimeField = models.DateTimeField(blank=True, null=True)
+    triage_status: models.CharField = models.CharField(
+        max_length=20, null=True, choices=TriageStatus.choices
+    )
+    triaged_at: models.DateTimeField = models.DateTimeField(null=True)
     # higher priority = earlier match
     priority: models.IntegerField = models.IntegerField(
         default=0, validators=(MinValueValidator(-2), MaxValueValidator(2))
diff --git a/server/reportmanager/serializers.py b/server/reportmanager/serializers.py
index e2390de7..b86d6f34 100644
--- a/server/reportmanager/serializers.py
+++ b/server/reportmanager/serializers.py
@@ -42,6 +42,9 @@ class BucketSerializer(serializers.ModelSerializer):
     )
     size = serializers.IntegerField(write_only=True, required=False)
     priority_score = serializers.FloatField(write_only=True, required=False)
+    triage_status_display = serializers.CharField(
+        source="get_triage_status_display", read_only=True
+    )
 
     class Meta:
         model = Bucket
@@ -51,19 +54,22 @@ class Meta:
             "color",
             "description",
             "domain",
-            "hide_until",
             "id",
             "latest_entry_id",
             "latest_report",
             "priority",
             "signature",
             "size",
+            "triage_status",
+            "triage_status_display",
+            "triaged_at",
             "reassign_in_progress",
             "priority_score",
         ]
         ordering = ("-id",)
         read_only_fields = [
             "id",
+            "triaged_at",
         ]
 
     def to_internal_value(self, data):
@@ -74,10 +80,14 @@ def to_internal_value(self, data):
 
     def to_representation(self, obj):
         serialized = super().to_representation(obj)
-        serialized["size"] = obj.size
+        serialized["size"] = getattr(obj, "size", None)
         serialized["latest_entry_id"] = getattr(obj, "latest_entry_id", None)
         serialized["latest_report"] = getattr(obj, "latest_report", None)
         serialized["priority_score"] = getattr(obj, "priority_score", None)
+        serialized["triage_status_choices"] = [
+            {"value": choice[0], "label": choice[1]}
+            for choice in Bucket.TriageStatus.choices
+        ]
         return serialized
 
 
diff --git a/server/reportmanager/templates/layouts/layout_base.html b/server/reportmanager/templates/layouts/layout_base.html
index a929670f..8bfbb405 100644
--- a/server/reportmanager/templates/layouts/layout_base.html
+++ b/server/reportmanager/templates/layouts/layout_base.html
@@ -32,46 +32,6 @@
   <script src="{% static 'js/params.js' %}"/></script>
   <script src="{% static 'js/cookie-csrf.js' %}"/></script>
 
-  <script>
-  (() => {
-    const notify_badge_class = 'badge';
-    const notify_api_url = '/inbox/notifications/api/unread_count/';
-    const notify_fetch_count = '5';
-    const notify_refresh_period = 0;
-    const consecutive_misfires = 0;
-
-    function fill_notification_badge(data) {
-      const badges = document.getElementsByClassName(notify_badge_class);
-      for (let i = 0; i < badges.length|0; i++) {
-        badges[i].innerHTML = data;
-      }
-    }
-
-    function fetch_api_data() {
-      fetch(notify_api_url+'?max='+notify_fetch_count, {credentials: 'same-origin'})
-      .then(response => {
-        if (response.ok) {
-          response.json()
-          .then(data => {
-            fill_notification_badge(data.unread_count);
-          })
-          if (notify_refresh_period) {
-            setTimeout(fetch_api_data, notify_refresh_period);
-          }
-        } else {
-          swal('Oops', E_SERVER_ERROR, 'error');
-          console.debug(response);
-        }
-      })
-      .catch(e => {
-        fill_notification_badge('!');
-      });
-    }
-
-    document.addEventListener("DOMContentLoaded", fetch_api_data)
-  })()
-  </script>
-
 {% endblock js%}
 {% if debug %}
   <script>
diff --git a/server/reportmanager/views.py b/server/reportmanager/views.py
index 701946be..b860c1c9 100644
--- a/server/reportmanager/views.py
+++ b/server/reportmanager/views.py
@@ -1120,6 +1120,7 @@ def __validate(self, bucket, submit_save, reassign, limit, offset, created):
                 data["url"] = reverse(
                     "reportmanager:bucketview", kwargs={"sig_id": bucket.pk}
                 )
+            data["bucket"] = self.get_serializer(bucket).data
         else:
             data["warning_message"] = "This is a preview, don't forget to save!"
 
@@ -1155,8 +1156,14 @@ def partial_update(self, request, *args, **kwargs):
 
             bucket.bug = bug
 
-        if "hide_until" in serializer.validated_data:
-            bucket.hide_until = serializer.validated_data["hide_until"]
+        if "triage_status" in serializer.validated_data:
+            new_status = serializer.validated_data["triage_status"]
+            if new_status != bucket.triage_status:
+                bucket.triage_status = new_status
+                if new_status is not None:
+                    bucket.triaged_at = timezone.now()
+                else:
+                    bucket.triaged_at = None
         if "signature" in serializer.validated_data:
             bucket.signature = serializer.validated_data["signature"]
         if "priority" in serializer.validated_data:
diff --git a/server/server/settings.py b/server/server/settings.py
index 05ddbdc4..ee78e238 100644
--- a/server/server/settings.py
+++ b/server/server/settings.py
@@ -311,10 +311,6 @@ def resolver_context_processor(request):
         "task": "reportmanager.cron.cleanup_old_reports",
         "schedule": 30 * 60,
     },
-    "Unhide hidden buckets every minute": {
-        "task": "reportmanager.cron.unhide_buckets",
-        "schedule": 60,
-    },
     "Backfill missing report data evry 12 hours": {
         "task": "reportmanager.cron.backfill_missing_report_data",
         "schedule": 60 * 60 * 12,
diff --git a/tests/e2e/conftest.py b/tests/e2e/conftest.py
index a5b41fb8..5ededa64 100644
--- a/tests/e2e/conftest.py
+++ b/tests/e2e/conftest.py
@@ -2,10 +2,17 @@
 
 import pytest
 
+from .fixtures.defaults import TEST_USER_EMAIL, TEST_USER_PASSWORD
 from .fixtures.reports_data import e2e_data  # noqa: F401
+from .page_objects.login import LoginPage
 
 
 @pytest.fixture(scope="session", autouse=True)
 def django_async_unsafe():
     """Allow Django ORM in pytest-playwright async context."""
     os.environ.setdefault("DJANGO_ALLOW_ASYNC_UNSAFE", "true")
+
+
+@pytest.fixture()
+def logged_in(page, live_server, e2e_data):
+    LoginPage(page, live_server).login(TEST_USER_EMAIL, TEST_USER_PASSWORD)
diff --git a/tests/e2e/fixtures/fixtures.json b/tests/e2e/fixtures/fixtures.json
index 338c4b4b..a849e2bb 100644
--- a/tests/e2e/fixtures/fixtures.json
+++ b/tests/e2e/fixtures/fixtures.json
@@ -111,7 +111,8 @@
       "color": null,
       "description": "www.joyn.de [Cluster 70854]",
       "domain": "www.joyn.de",
-      "hide_until": null,
+      "triage_status": null,
+      "triaged_at": null,
       "priority": 0,
       "signature": "{\"symptoms\": [{\"type\": \"url\", \"part\": \"hostname\", \"value\": \"www.joyn.de\"}]}",
       "reassign_in_progress": false,
@@ -126,7 +127,8 @@
       "color": null,
       "description": "www.filae.com [Cluster 72827]",
       "domain": "www.filae.com",
-      "hide_until": null,
+      "triage_status": null,
+      "triaged_at": null,
       "priority": 0,
       "signature": "{\"symptoms\": [{\"type\": \"url\", \"part\": \"hostname\", \"value\": \"www.filae.com\"}]}",
       "reassign_in_progress": false,
@@ -141,7 +143,8 @@
       "color": null,
       "description": "www.vicroads.vic.gov.au [Cluster 72119]",
       "domain": "www.vicroads.vic.gov.au",
-      "hide_until": null,
+      "triage_status": null,
+      "triaged_at": null,
       "priority": 0,
       "signature": "{\"symptoms\": [{\"type\": \"url\", \"part\": \"hostname\", \"value\": \"www.vicroads.vic.gov.au\"}]}",
       "reassign_in_progress": false,
@@ -156,7 +159,8 @@
       "color": null,
       "description": "www.vicroads.vic.gov.au [Cluster 72121]",
       "domain": "www.vicroads.vic.gov.au",
-      "hide_until": null,
+      "triage_status": null,
+      "triaged_at": null,
       "priority": 0,
       "signature": "{\"symptoms\": [{\"type\": \"url\", \"part\": \"hostname\", \"value\": \"www.vicroads.vic.gov.au\"}]}",
       "reassign_in_progress": false,
@@ -171,7 +175,8 @@
       "color": null,
       "description": "domain is www.vicroads.vic.gov.au",
       "domain": "www.vicroads.vic.gov.au",
-      "hide_until": null,
+      "triage_status": null,
+      "triaged_at": null,
       "priority": 0,
       "signature": "{\"symptoms\": [{\"type\": \"url\", \"part\": \"hostname\", \"value\": \"www.vicroads.vic.gov.au\"}]}",
       "reassign_in_progress": false,
@@ -186,7 +191,8 @@
       "color": null,
       "description": "domain is www.filae.com",
       "domain": "www.filae.com",
-      "hide_until": null,
+      "triage_status": null,
+      "triaged_at": null,
       "priority": 0,
       "signature": "{\"symptoms\": [{\"type\": \"url\", \"part\": \"hostname\", \"value\": \"www.filae.com\"}]}",
       "reassign_in_progress": false,
@@ -201,13 +207,30 @@
       "color": null,
       "description": "domain is www.joyn.de",
       "domain": "www.joyn.de",
-      "hide_until": null,
+      "triage_status": null,
+      "triaged_at": null,
       "priority": 0,
       "signature": "{\"symptoms\": [{\"type\": \"url\", \"part\": \"hostname\", \"value\": \"www.joyn.de\"}]}",
       "reassign_in_progress": false,
       "cluster": null
     }
   },
+  {
+    "model": "reportmanager.bucket",
+    "pk": 999999,
+    "fields": {
+      "bug": null,
+      "color": null,
+      "description": "www.example-triaged.com [Cluster 99999]",
+      "domain": "www.example-triaged.com",
+      "triage_status": "worksforme",
+      "triaged_at": "2026-04-10T18:05:00+00:00",
+      "priority": 0,
+      "signature": "{\"symptoms\": [{\"type\": \"url\", \"part\": \"hostname\", \"value\": \"www.example-triaged.com\"}]}",
+      "reassign_in_progress": false,
+      "cluster": 99999
+    }
+  },
   {
     "model": "reportmanager.reportentry",
     "pk": 1000,
@@ -223,9 +246,9 @@
       "domain": "www.joyn.de",
       "ml_valid_probability": 0.842287540435791,
       "os": 1,
-      "reported_at": "2026-04-22T18:08:26.214371+00:00",
+      "reported_at": "2026-04-14T18:05:00+00:00",
       "url": "https://www.joyn.de/",
-      "uuid": "8e5c608f-d493-4166-869d-f25e0700defb",
+      "uuid": "00000000-0000-0000-0000-000000001000",
       "cluster": 70854
     }
   },
@@ -244,9 +267,9 @@
       "domain": "www.joyn.de",
       "ml_valid_probability": 0.9333918690681458,
       "os": 2,
-      "reported_at": "2026-04-20T18:08:26.214544+00:00",
+      "reported_at": "2026-04-12T18:05:00+00:00",
       "url": "https://www.joyn.de/",
-      "uuid": "801f2bc8-c920-44f8-a177-e1f9a2bf2eb5",
+      "uuid": "00000000-0000-0000-0000-000000001001",
       "cluster": 70854
     }
   },
@@ -265,9 +288,9 @@
       "domain": "www.joyn.de",
       "ml_valid_probability": 0.6257511377334595,
       "os": 3,
-      "reported_at": "2026-04-08T18:08:26.214553+00:00",
+      "reported_at": "2026-04-01T18:05:00+00:00",
       "url": "https://www.joyn.de/",
-      "uuid": "e6a54010-5177-44f6-a94a-22b0621c4714",
+      "uuid": "00000000-0000-0000-0000-000000001002",
       "cluster": 70854
     }
   },
@@ -286,9 +309,9 @@
       "domain": "www.joyn.de",
       "ml_valid_probability": 0.8234567,
       "os": 4,
-      "reported_at": "2026-03-09T18:08:26.214559+00:00",
+      "reported_at": "2026-03-16T18:05:00+00:00",
       "url": "https://www.joyn.de/",
-      "uuid": "1669b40f-dfc0-4574-a561-e47bcd04692e",
+      "uuid": "00000000-0000-0000-0000-000000001003",
       "cluster": 70854
     }
   },
@@ -307,9 +330,9 @@
       "domain": "www.filae.com",
       "ml_valid_probability": 0.9146597981452942,
       "os": 1,
-      "reported_at": "2026-04-22T18:08:26.214565+00:00",
+      "reported_at": "2026-04-14T18:05:00+00:00",
       "url": "https://www.filae.com/",
-      "uuid": "409600cd-7a54-450c-908e-5e1d23856258",
+      "uuid": "00000000-0000-0000-0000-000000001004",
       "cluster": 72827
     }
   },
@@ -328,9 +351,9 @@
       "domain": "www.filae.com",
       "ml_valid_probability": 0.7248315811157227,
       "os": 2,
-      "reported_at": "2026-04-20T18:08:26.214569+00:00",
+      "reported_at": "2026-04-12T18:05:00+00:00",
       "url": "https://www.filae.com/",
-      "uuid": "91dd00a0-3ffc-4d5f-934a-26c376d76bd0",
+      "uuid": "00000000-0000-0000-0000-000000001005",
       "cluster": 72827
     }
   },
@@ -349,9 +372,9 @@
       "domain": "www.filae.com",
       "ml_valid_probability": 0.9729971885681152,
       "os": 3,
-      "reported_at": "2026-04-08T18:08:26.214573+00:00",
+      "reported_at": "2026-04-01T18:05:00+00:00",
       "url": "https://www.filae.com/",
-      "uuid": "2d0aa508-1c6c-4b22-b916-1fc5d18c87b9",
+      "uuid": "00000000-0000-0000-0000-000000001006",
       "cluster": 72827
     }
   },
@@ -370,9 +393,9 @@
       "domain": "www.vicroads.vic.gov.au",
       "ml_valid_probability": 0.9730769395828247,
       "os": 1,
-      "reported_at": "2026-04-22T18:08:26.214580+00:00",
+      "reported_at": "2026-04-14T18:05:00+00:00",
       "url": "https://www.vicroads.vic.gov.au/",
-      "uuid": "b8e51e1f-1951-463f-a1bc-87f1624ae599",
+      "uuid": "00000000-0000-0000-0000-000000001007",
       "cluster": 72119
     }
   },
@@ -391,9 +414,9 @@
       "domain": "www.vicroads.vic.gov.au",
       "ml_valid_probability": 0.9550638198852539,
       "os": 2,
-      "reported_at": "2026-04-20T18:08:26.214587+00:00",
+      "reported_at": "2026-04-12T18:05:00+00:00",
       "url": "https://www.vicroads.vic.gov.au/",
-      "uuid": "e02674d2-37a9-4717-b3cd-36a206925ce2",
+      "uuid": "00000000-0000-0000-0000-000000001008",
       "cluster": 72119
     }
   },
@@ -412,9 +435,9 @@
       "domain": "www.vicroads.vic.gov.au",
       "ml_valid_probability": 0.5003429651260376,
       "os": 3,
-      "reported_at": "2026-04-08T18:08:26.214591+00:00",
+      "reported_at": "2026-04-01T18:05:00+00:00",
       "url": "https://www.vicroads.vic.gov.au/",
-      "uuid": "84ba1ac2-8816-4209-9ced-93f9d36baaed",
+      "uuid": "00000000-0000-0000-0000-000000001009",
       "cluster": 72119
     }
   },
@@ -433,9 +456,9 @@
       "domain": "www.vicroads.vic.gov.au",
       "ml_valid_probability": 0.3770124912261963,
       "os": 1,
-      "reported_at": "2026-04-22T18:08:26.214595+00:00",
+      "reported_at": "2026-04-14T18:05:00+00:00",
       "url": "https://www.vicroads.vic.gov.au/",
-      "uuid": "07b36153-a614-41d4-bf38-c67423c7fdb5",
+      "uuid": "00000000-0000-0000-0000-000000001010",
       "cluster": 72121
     }
   },
@@ -454,9 +477,9 @@
       "domain": "www.vicroads.vic.gov.au",
       "ml_valid_probability": 0.9809913039207458,
       "os": 2,
-      "reported_at": "2026-04-20T18:08:26.214600+00:00",
+      "reported_at": "2026-04-12T18:05:00+00:00",
       "url": "https://www.vicroads.vic.gov.au/",
-      "uuid": "c8e9d0e2-d89e-40b4-8910-f3e72b5bc813",
+      "uuid": "00000000-0000-0000-0000-000000001011",
       "cluster": 72121
     }
   },
@@ -475,9 +498,9 @@
       "domain": "www.vicroads.vic.gov.au",
       "ml_valid_probability": null,
       "os": 1,
-      "reported_at": "2026-04-22T18:08:26.214606+00:00",
+      "reported_at": "2026-04-14T18:05:00+00:00",
       "url": "https://www.vicroads.vic.gov.au/",
-      "uuid": "0a75f9e6-f7e3-4d16-940a-c4a8109f1fbf",
+      "uuid": "00000000-0000-0000-0000-000000001012",
       "cluster": null
     }
   },
@@ -496,9 +519,9 @@
       "domain": "www.vicroads.vic.gov.au",
       "ml_valid_probability": null,
       "os": 2,
-      "reported_at": "2026-04-20T18:08:26.214611+00:00",
+      "reported_at": "2026-04-12T18:05:00+00:00",
       "url": "https://www.vicroads.vic.gov.au/",
-      "uuid": "89bfb99e-25a4-4fb1-a1e4-2b8c1e3b79ba",
+      "uuid": "00000000-0000-0000-0000-000000001013",
       "cluster": null
     }
   },
@@ -517,9 +540,9 @@
       "domain": "www.vicroads.vic.gov.au",
       "ml_valid_probability": null,
       "os": 3,
-      "reported_at": "2026-04-08T18:08:26.214615+00:00",
+      "reported_at": "2026-04-01T18:05:00+00:00",
       "url": "https://www.vicroads.vic.gov.au/",
-      "uuid": "56afec9f-feb3-4cca-92c6-2ec326871fbe",
+      "uuid": "00000000-0000-0000-0000-000000001014",
       "cluster": null
     }
   },
@@ -538,9 +561,9 @@
       "domain": "www.vicroads.vic.gov.au",
       "ml_valid_probability": null,
       "os": 4,
-      "reported_at": "2026-03-09T18:08:26.214618+00:00",
+      "reported_at": "2026-03-16T18:05:00+00:00",
       "url": "https://www.vicroads.vic.gov.au/",
-      "uuid": "7f453630-4dee-408a-881a-39461702bfff",
+      "uuid": "00000000-0000-0000-0000-000000001015",
       "cluster": null
     }
   },
@@ -559,9 +582,9 @@
       "domain": "www.filae.com",
       "ml_valid_probability": null,
       "os": 1,
-      "reported_at": "2026-04-22T18:08:26.214624+00:00",
+      "reported_at": "2026-04-14T18:05:00+00:00",
       "url": "https://www.filae.com/",
-      "uuid": "16fb33a5-663e-4b55-86d7-0d287e938cd2",
+      "uuid": "00000000-0000-0000-0000-000000001016",
       "cluster": null
     }
   },
@@ -580,9 +603,9 @@
       "domain": "www.joyn.de",
       "ml_valid_probability": null,
       "os": 1,
-      "reported_at": "2026-04-22T18:08:26.214628+00:00",
+      "reported_at": "2026-04-14T18:05:00+00:00",
       "url": "https://www.joyn.de/",
-      "uuid": "0754064b-9cb5-4c4c-8097-20a0fe20ed3b",
+      "uuid": "00000000-0000-0000-0000-000000001017",
       "cluster": null
     }
   },
@@ -601,12 +624,54 @@
       "domain": "www.joyn.de",
       "ml_valid_probability": null,
       "os": 2,
-      "reported_at": "2026-04-20T18:08:26.214631+00:00",
+      "reported_at": "2026-04-12T18:05:00+00:00",
       "url": "https://www.joyn.de/",
-      "uuid": "fbc22954-cec5-407d-990a-e437153af57c",
+      "uuid": "00000000-0000-0000-0000-000000001018",
       "cluster": null
     }
   },
+  {
+    "model": "reportmanager.reportentry",
+    "pk": 1019,
+    "fields": {
+      "app": 1,
+      "breakage_category": 1,
+      "bucket": 999999,
+      "comments": "Site is broken on Firefox",
+      "comments_translated": "Site is broken on Firefox",
+      "comments_original_language": "en",
+      "comments_preprocessed": "site is broken on firefox",
+      "details": {},
+      "domain": "www.example-triaged.com",
+      "ml_valid_probability": 0.9,
+      "os": 1,
+      "reported_at": "2026-04-14T18:05:00+00:00",
+      "url": "https://www.example-triaged.com/",
+      "uuid": "00000000-0000-0000-0000-000000001019",
+      "cluster": 99999
+    }
+  },
+  {
+    "model": "reportmanager.reportentry",
+    "pk": 1020,
+    "fields": {
+      "app": 2,
+      "breakage_category": 1,
+      "bucket": 999999,
+      "comments": "Page not working as expected",
+      "comments_translated": "Page not working as expected",
+      "comments_original_language": "en",
+      "comments_preprocessed": "page not working as expected",
+      "details": {},
+      "domain": "www.example-triaged.com",
+      "ml_valid_probability": 0.85,
+      "os": 2,
+      "reported_at": "2026-04-12T18:05:00+00:00",
+      "url": "https://www.example-triaged.com/",
+      "uuid": "00000000-0000-0000-0000-000000001020",
+      "cluster": 99999
+    }
+  },
   {
     "model": "reportmanager.cluster",
     "pk": 70854,
@@ -638,5 +703,13 @@
       "domain": "www.vicroads.vic.gov.au",
       "centroid": 1010
     }
+  },
+  {
+    "model": "reportmanager.cluster",
+    "pk": 99999,
+    "fields": {
+      "domain": "www.example-triaged.com",
+      "centroid": 1019
+    }
   }
 ]
\ No newline at end of file
diff --git a/tests/e2e/fixtures/reports_data.py b/tests/e2e/fixtures/reports_data.py
index 8e9deb02..80c8a3ff 100644
--- a/tests/e2e/fixtures/reports_data.py
+++ b/tests/e2e/fixtures/reports_data.py
@@ -1,9 +1,12 @@
 import pytest
 from django.contrib.auth.hashers import make_password
+from django.contrib.auth.models import Permission
 from django.contrib.auth.models import User as DjangoUser
+from django.contrib.contenttypes.models import ContentType
 from django.core.management import call_command
 
 from reportmanager.models import Bucket
+from reportmanager.models import User as ReportManagerUser
 
 from .defaults import TEST_USER_EMAIL, TEST_USER_PASSWORD
 
@@ -12,12 +15,28 @@
 def e2e_data(db):
     call_command("loaddata", "tests/e2e/fixtures/fixtures.json", verbosity=0)
 
-    DjangoUser.objects.get_or_create(
+    user, _ = DjangoUser.objects.get_or_create(
         username=TEST_USER_EMAIL,
         defaults={
             "email": TEST_USER_EMAIL,
             "password": make_password(TEST_USER_PASSWORD),
         },
     )
+    write_perm = Permission.objects.get(
+        content_type=ContentType.objects.get_for_model(ReportManagerUser),
+        codename="reportmanager_write",
+    )
+    user.user_permissions.add(write_perm)
 
-    return {"bucket_count": Bucket.objects.count()}
+    return {
+        "bucket_count": Bucket.objects.count(),
+        "triaged_bucket_id": Bucket.objects.filter(triage_status__isnull=False)
+        .order_by("id")
+        .first()
+        .id,
+        "untriaged_bucket_id": Bucket.objects.filter(triage_status__isnull=True)
+        .order_by("id")
+        .first()
+        .id,
+        "triaged_count": Bucket.objects.filter(triage_status__isnull=False).count(),
+    }
diff --git a/tests/e2e/page_objects/base.py b/tests/e2e/page_objects/base.py
index 32fd962e..2fa97358 100644
--- a/tests/e2e/page_objects/base.py
+++ b/tests/e2e/page_objects/base.py
@@ -12,4 +12,6 @@ def __init__(self, page, live_server):
 
     def navigate(self):
         """Navigate to this page's URL."""
+        if self.page.url != "about:blank":
+            self.page.wait_for_load_state("networkidle")
         self.page.goto(f"{self.live_server.url}{self.url}")
diff --git a/tests/e2e/page_objects/bucket_view.py b/tests/e2e/page_objects/bucket_view.py
new file mode 100644
index 00000000..505bc147
--- /dev/null
+++ b/tests/e2e/page_objects/bucket_view.py
@@ -0,0 +1,41 @@
+from playwright.sync_api import expect
+
+from .base import PageObject
+
+
+class BucketViewPage(PageObject):
+    """Page object for an individual bucket's detail page."""
+
+    def __init__(self, page, live_server, bucket_id):
+        super().__init__(page, live_server)
+        self.bucket_id = bucket_id
+        self.url = f"/reportmanager/buckets/{bucket_id}/"
+
+        self.triage_trigger = self.page.get_by_test_id("triage-trigger")
+        self.triage_panel = self.page.get_by_test_id("triage-panel")
+        self.triage_status_display = self.page.get_by_test_id("triage-status-display")
+        self.triage_status_label = self.page.get_by_test_id("triage-status-label")
+        self.unmark_option = self.page.get_by_test_id("triage-unmark")
+
+    def wait_for_loaded(self):
+        """Wait for the bucket view's triage trigger to be visible."""
+        self.triage_trigger.wait_for(state="visible")
+
+    def open_triage_panel(self):
+        self.triage_trigger.click()
+        self.triage_panel.wait_for(state="visible")
+
+    def select_triage_status(self, status_value):
+        """Select a triage status option by its value (e.g. 'worksforme')."""
+        self.page.get_by_test_id(f"triage-option-{status_value}").click()
+        self.triage_panel.wait_for(state="hidden")
+
+    def unmark_triage(self):
+        self.unmark_option.click()
+        self.triage_panel.wait_for(state="hidden")
+
+    def expect_triage_label(self, text):
+        expect(self.triage_status_label).to_have_text(text)
+
+    def expect_triage_trigger(self, text):
+        expect(self.triage_trigger).to_have_text(text)
diff --git a/tests/e2e/page_objects/buckets.py b/tests/e2e/page_objects/buckets.py
index 0ab4831d..e5dccfb8 100644
--- a/tests/e2e/page_objects/buckets.py
+++ b/tests/e2e/page_objects/buckets.py
@@ -10,6 +10,7 @@ def __init__(self, page, live_server):
         super().__init__(page, live_server)
 
         self.bucket_items = self.page.get_by_test_id("bucket-row")
+        self.show_triaged_toggle = self.page.get_by_test_id("show-triaged-toggle")
 
     def bucket_count(self):
         """Return the number of buckets displayed on the page."""
@@ -18,3 +19,11 @@ def bucket_count(self):
     def wait_for_buckets_to_load(self):
         """Wait for bucket rows to appear on the page."""
         self.bucket_items.first.wait_for(state="visible")
+
+    def click_show_triaged_toggle(self):
+        """Toggle between Show Triaged / Hide Triaged."""
+        with self.page.expect_response(
+            lambda r: "/reportmanager/rest/buckets/" in r.url
+            and r.request.method == "GET"
+        ):
+            self.show_triaged_toggle.click()
diff --git a/tests/e2e/page_objects/login.py b/tests/e2e/page_objects/login.py
index 9f4c5e20..5256f7d2 100644
--- a/tests/e2e/page_objects/login.py
+++ b/tests/e2e/page_objects/login.py
@@ -17,8 +17,8 @@ def login(self, email, password):
         self.navigate()
         self.username_input.fill(email)
         self.password_input.fill(password)
-        self.submit_button.click()
-        self.page.wait_for_load_state("networkidle")
+        with self.page.expect_navigation():
+            self.submit_button.click()
 
         assert not self.page.url.endswith("/login/"), (
             f"Login failed: still on login page ({self.page.url})"
diff --git a/tests/e2e/scripts/generate_e2e_fixtures.py b/tests/e2e/scripts/generate_e2e_fixtures.py
index a9b3fa3b..1a94302a 100644
--- a/tests/e2e/scripts/generate_e2e_fixtures.py
+++ b/tests/e2e/scripts/generate_e2e_fixtures.py
@@ -9,10 +9,11 @@
 # ruff: noqa: E501, PERF401
 
 import json
-import uuid
 from datetime import UTC, datetime, timedelta
 from pathlib import Path
 
+ANCHOR_DATE = datetime(2026, 4, 15, 18, 5, 0, tzinfo=UTC)
+
 BUCKETS_CONFIG = [
     {
         "id": 131189,
@@ -20,6 +21,8 @@
         "description": "www.joyn.de [Cluster 70854]",
         "cluster_id": 70854,
         "priority": 0,
+        "triage_status": None,
+        "triaged_at": None,
         "signature": '{"symptoms": [{"type": "url", "part": "hostname", "value": "www.joyn.de"}]}',
         "comments": [
             {
@@ -58,6 +61,8 @@
         "description": "www.filae.com [Cluster 72827]",
         "cluster_id": 72827,
         "priority": 0,
+        "triage_status": None,
+        "triaged_at": None,
         "signature": '{"symptoms": [{"type": "url", "part": "hostname", "value": "www.filae.com"}]}',
         "comments": [
             {
@@ -89,6 +94,8 @@
         "description": "www.vicroads.vic.gov.au [Cluster 72119]",
         "cluster_id": 72119,
         "priority": 0,
+        "triage_status": None,
+        "triaged_at": None,
         "signature": '{"symptoms": [{"type": "url", "part": "hostname", "value": "www.vicroads.vic.gov.au"}]}',
         "comments": [
             {
@@ -120,6 +127,8 @@
         "description": "www.vicroads.vic.gov.au [Cluster 72121]",
         "cluster_id": 72121,
         "priority": 0,
+        "triage_status": None,
+        "triaged_at": None,
         "signature": '{"symptoms": [{"type": "url", "part": "hostname", "value": "www.vicroads.vic.gov.au"}]}',
         "comments": [
             {
@@ -144,6 +153,8 @@
         "description": "domain is www.vicroads.vic.gov.au",
         "cluster_id": None,
         "priority": 0,
+        "triage_status": None,
+        "triaged_at": None,
         "signature": '{"symptoms": [{"type": "url", "part": "hostname", "value": "www.vicroads.vic.gov.au"}]}',
         "comments": [
             {
@@ -182,6 +193,8 @@
         "description": "domain is www.filae.com",
         "cluster_id": None,
         "priority": 0,
+        "triage_status": None,
+        "triaged_at": None,
         "signature": '{"symptoms": [{"type": "url", "part": "hostname", "value": "www.filae.com"}]}',
         "comments": [
             {
@@ -199,6 +212,8 @@
         "description": "domain is www.joyn.de",
         "cluster_id": None,
         "priority": 0,
+        "triage_status": None,
+        "triaged_at": None,
         "signature": '{"symptoms": [{"type": "url", "part": "hostname", "value": "www.joyn.de"}]}',
         "comments": [
             {
@@ -217,6 +232,32 @@
             },
         ],
     },
+    {
+        "id": 999999,
+        "domain": "www.example-triaged.com",
+        "description": "www.example-triaged.com [Cluster 99999]",
+        "cluster_id": 99999,
+        "priority": 0,
+        "triage_status": "worksforme",
+        "triaged_at": ANCHOR_DATE - timedelta(days=5),
+        "signature": '{"symptoms": [{"type": "url", "part": "hostname", "value": "www.example-triaged.com"}]}',
+        "comments": [
+            {
+                "comments": "Site is broken on Firefox",
+                "comments_translated": "Site is broken on Firefox",
+                "comments_original_language": "en",
+                "breakage_category": "load",
+                "ml_valid_probability": 0.9,
+            },
+            {
+                "comments": "Page not working as expected",
+                "comments_translated": "Page not working as expected",
+                "comments_original_language": "en",
+                "breakage_category": "load",
+                "ml_valid_probability": 0.85,
+            },
+        ],
+    },
 ]
 
 # Supporting data
@@ -289,7 +330,12 @@ def generate_fixtures():
                     "color": None,
                     "description": bucket_config["description"],
                     "domain": bucket_config["domain"],
-                    "hide_until": None,
+                    "triage_status": bucket_config["triage_status"],
+                    "triaged_at": (
+                        bucket_config["triaged_at"].isoformat()
+                        if bucket_config["triaged_at"]
+                        else None
+                    ),
                     "priority": bucket_config["priority"],
                     "signature": bucket_config["signature"],
                     "reassign_in_progress": False,
@@ -351,10 +397,10 @@ def generate_fixtures():
                         "ml_valid_probability": comment_data["ml_valid_probability"],
                         "os": (i % len(OS_DATA)) + 1,  # Rotate through all OS
                         "reported_at": (
-                            datetime.now(UTC) - timedelta(days=days_ago)
+                            ANCHOR_DATE - timedelta(days=days_ago)
                         ).isoformat(),
                         "url": f"https://{bucket_config['domain']}/",
-                        "uuid": str(uuid.uuid4()),
+                        "uuid": f"00000000-0000-0000-0000-{report_id:012d}",
                         "cluster": bucket_config["cluster_id"],
                     },
                 }
diff --git a/tests/e2e/test_bucket_view.py b/tests/e2e/test_bucket_view.py
new file mode 100644
index 00000000..3cb6c1d2
--- /dev/null
+++ b/tests/e2e/test_bucket_view.py
@@ -0,0 +1,52 @@
+import pytest
+
+from .page_objects.bucket_view import BucketViewPage
+
+
+@pytest.fixture()
+def bucket_view_page(page, live_server, logged_in):
+    def load(bucket_id):
+        view = BucketViewPage(page, live_server, bucket_id)
+        view.navigate()
+        view.wait_for_loaded()
+        return view
+
+    return load
+
+
+@pytest.mark.ui
+@pytest.mark.django_db(transaction=True)
+def test_mark_bucket_triaged(bucket_view_page, e2e_data):
+    bucket_view = bucket_view_page(e2e_data["untriaged_bucket_id"])
+
+    # No triage status set yet, button reads "Mark triaged" and the status
+    # display is absent.
+    bucket_view.expect_triage_trigger("Mark triaged")
+    assert bucket_view.triage_status_display.count() == 0
+
+    bucket_view.open_triage_panel()
+    bucket_view.select_triage_status("worksforme")
+
+    bucket_view.expect_triage_trigger("Change triage status")
+    bucket_view.expect_triage_label("Works For Me")
+
+
+@pytest.mark.ui
+@pytest.mark.django_db(transaction=True)
+def test_change_and_unmark_triage_status(bucket_view_page, e2e_data):
+    bucket_view = bucket_view_page(e2e_data["triaged_bucket_id"])
+
+    # Already has "worksforme" status
+    bucket_view.expect_triage_trigger("Change triage status")
+    bucket_view.expect_triage_label("Works For Me")
+
+    # Change to a different status
+    bucket_view.open_triage_panel()
+    bucket_view.select_triage_status("invalid")
+    bucket_view.expect_triage_label("Invalid")
+
+    # Unmark
+    bucket_view.open_triage_panel()
+    bucket_view.unmark_triage()
+    bucket_view.expect_triage_trigger("Mark triaged")
+    assert bucket_view.triage_status_display.count() == 0
diff --git a/tests/e2e/test_buckets.py b/tests/e2e/test_buckets.py
index ef5d3392..72ae43ea 100644
--- a/tests/e2e/test_buckets.py
+++ b/tests/e2e/test_buckets.py
@@ -1,22 +1,39 @@
 import pytest
 
-from .fixtures.defaults import TEST_USER_EMAIL, TEST_USER_PASSWORD
 from .page_objects.buckets import BucketsPage
-from .page_objects.login import LoginPage
 
 
 @pytest.mark.ui
 @pytest.mark.django_db(transaction=True)
-def test_buckets_page(page, live_server, e2e_data):
-    login_page = LoginPage(page, live_server)
-    login_page.login(TEST_USER_EMAIL, TEST_USER_PASSWORD)
-
+def test_buckets_page(page, live_server, logged_in, e2e_data):
     buckets_page = BucketsPage(page, live_server)
     buckets_page.navigate()
     buckets_page.wait_for_buckets_to_load()
 
-    expected_buckets = e2e_data["bucket_count"]
+    # Default view excludes triaged buckets.
+    expected_buckets = e2e_data["bucket_count"] - e2e_data["triaged_count"]
     actual_buckets = buckets_page.bucket_count()
     assert actual_buckets == expected_buckets, (
         f"Expected {expected_buckets} buckets, but found {actual_buckets}"
     )
+
+
+@pytest.mark.ui
+@pytest.mark.django_db(transaction=True)
+def test_buckets_list_show_hide_triaged(page, live_server, logged_in, e2e_data):
+    buckets_page = BucketsPage(page, live_server)
+    buckets_page.navigate()
+    buckets_page.wait_for_buckets_to_load()
+
+    untriaged_count = e2e_data["bucket_count"] - e2e_data["triaged_count"]
+    assert buckets_page.bucket_count() == untriaged_count
+
+    # Show Triaged - all buckets visible
+    buckets_page.click_show_triaged_toggle()
+    buckets_page.wait_for_buckets_to_load()
+    assert buckets_page.bucket_count() == e2e_data["bucket_count"]
+
+    # Hide Triaged again
+    buckets_page.click_show_triaged_toggle()
+    buckets_page.wait_for_buckets_to_load()
+    assert buckets_page.bucket_count() == untriaged_count