diff --git a/storage_controller/migrations/2025-05-26-105843_sk_ps_discovery/down.sql b/storage_controller/migrations/2025-05-26-105843_sk_ps_discovery/down.sql
index 46c8379fda..b4983adc04 100644
--- a/storage_controller/migrations/2025-05-26-105843_sk_ps_discovery/down.sql
+++ b/storage_controller/migrations/2025-05-26-105843_sk_ps_discovery/down.sql
@@ -1,3 +1,9 @@
+DROP TRIGGER on_timelines_UPDATE_enqueue_sk_ps_discovery on "timelines";
+DROP FUNCTION on_timelines_UPDATE_enqueue_sk_ps_discovery_triggerfn;
+DROP TRIGGER on_timelines_DELETE_enqueue_sk_ps_discovery on "timelines";
+DROP FUNCTION on_timelines_DELETE_enqueue_sk_ps_discovery_triggerfn;
+DROP TRIGGER on_timelines_INSERT_enqueue_sk_ps_discovery on "timelines";
+DROP FUNCTION on_timelines_INSERT_enqueue_sk_ps_discovery_triggerfn;
 DROP TRIGGER on_ps_tenant_shard_UPDATE_enqueue_sk_ps_discovery on "tenant_shards";
 DROP FUNCTION on_ps_tenant_shard_UPDATE_enqueue_sk_ps_discovery_triggerfn;
 DROP TRIGGER on_ps_tenant_shard_DELETE_enqueue_sk_ps_discovery on "tenant_shards";
diff --git a/storage_controller/migrations/2025-05-26-105843_sk_ps_discovery/up.sql b/storage_controller/migrations/2025-05-26-105843_sk_ps_discovery/up.sql
index 067dba8c11..d20894bce1 100644
--- a/storage_controller/migrations/2025-05-26-105843_sk_ps_discovery/up.sql
+++ b/storage_controller/migrations/2025-05-26-105843_sk_ps_discovery/up.sql
@@ -3,8 +3,8 @@ CREATE TABLE "sk_ps_discovery"(
 	"shard_number" INT4 NOT NULL,
 	"shard_count" INT4 NOT NULL,
 	"ps_generation" INT4 NOT NULL,
-	"sk_id" INT8 NOT NULL,
-	"ps_id" INT8 NOT NULL,
+	"sk_id" INT8 NOT NULL REFERENCES "safekeepers"("id") ON DELETE CASCADE, -- more efficient that trigger on "safekeepers"
+	"ps_id" INT8 NOT NULL REFERENCES "nodes"("node_id") ON DELETE CASCADE, -- more efficient that trigger on "nodes"
 	"created_at" TIMESTAMPTZ NOT NULL,
 	"last_attempt_at" TIMESTAMPTZ,
 	PRIMARY KEY("tenant_id", "shard_number", "shard_count", "ps_generation", "sk_id")
@@ -19,19 +19,26 @@ BEGIN
 
 	INSERT INTO sk_ps_discovery (tenant_id, shard_number, shard_count, ps_generation, sk_id, ps_id,created_at,last_attempt_at)
 		WITH sk_timeline_attachments AS (
-			SELECT DISTINCT tenant_id,timeline_id,unnest(array_cat(sk_set, new_sk_set)) as sk_id FROM timelines
-			WHERE tenant_id = ARG_TENANT_ID
+			SELECT DISTINCT tenant_id,unnest(array_cat(sk_set, new_sk_set)) as sk_id FROM timelines
+			WHERE
+				tenant_id = ARG_TENANT_ID
+				AND
+				timelines.deleted_at IS NULL
 		)
 		SELECT tenant_shards.tenant_id, tenant_shards.shard_number, tenant_shards.shard_count, tenant_shards.generation, sk_timeline_attachments.sk_id, tenant_shards.generation_pageserver, NOW(), NULL
 		FROM tenant_shards
 		INNER JOIN sk_timeline_attachments ON tenant_shards.tenant_id = sk_timeline_attachments.tenant_id;
 
+	-- TODO: how do no-longer-existing attachment infos get cleaned up on the SKs?
+	-- I think we do need a table of tenant timeline shard attachments, we flag as "deleted" here, and background loop processes it.
+
 	PERFORM pg_notify('sk_ps_discovery', json_build_object(
 		'tenant_id', ARG_TENANT_ID
 	)::text);
 END;
 $$ LANGUAGE plpgsql;
 
+-- Trigger on tenant_shards table
 
 CREATE OR REPLACE FUNCTION on_ps_tenant_shard_INSERT_enqueue_sk_ps_discovery_triggerfn()
 RETURNS TRIGGER AS $$
@@ -74,4 +81,44 @@ ON "tenant_shards"
 FOR EACH ROW
 EXECUTE FUNCTION on_ps_tenant_shard_UPDATE_enqueue_sk_ps_discovery_triggerfn();
 
--- TODO: same for `timelines` table
+--  Trigger on timelines table
+
+CREATE OR REPLACE FUNCTION on_timelines_INSERT_enqueue_sk_ps_discovery_triggerfn()
+RETURNS TRIGGER AS $$
+BEGIN
+	PERFORM sk_ps_discovery_enqueue_tenant(NEW.tenant_id);
+	RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+CREATE OR REPLACE TRIGGER on_timelines_INSERT_enqueue_sk_ps_discovery
+AFTER INSERT
+ON "timelines"
+FOR EACH ROW
+EXECUTE FUNCTION on_timelines_INSERT_enqueue_sk_ps_discovery_triggerfn();
+
+CREATE OR REPLACE FUNCTION on_timelines_DELETE_enqueue_sk_ps_discovery_triggerfn()
+RETURNS TRIGGER AS $$
+BEGIN
+	PERFORM sk_ps_discovery_enqueue_tenant(OLD.tenant_id);
+	RETURN OLD;
+END;
+$$ LANGUAGE plpgsql;
+CREATE OR REPLACE TRIGGER on_timelines_DELETE_enqueue_sk_ps_discovery
+AFTER DELETE
+ON "timelines"
+FOR EACH ROW
+EXECUTE FUNCTION on_timelines_DELETE_enqueue_sk_ps_discovery_triggerfn();
+
+CREATE OR REPLACE FUNCTION on_timelines_UPDATE_enqueue_sk_ps_discovery_triggerfn()
+RETURNS TRIGGER AS $$
+BEGIN
+	PERFORM sk_ps_discovery_enqueue_tenant(NEW.tenant_id);
+	RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+CREATE OR REPLACE TRIGGER on_timelines_UPDATE_enqueue_sk_ps_discovery
+AFTER UPDATE
+ON "timelines"
+FOR EACH ROW
+EXECUTE FUNCTION on_timelines_UPDATE_enqueue_sk_ps_discovery_triggerfn();
+