diff --git a/.repo/sql/scratchpad.sql b/.repo/sql/scratchpad.sql
index 0c1fe7e..a71ba67 100644
--- a/.repo/sql/scratchpad.sql
+++ b/.repo/sql/scratchpad.sql
@@ -35,3 +35,23 @@ FROM
   Org o
 LEFT JOIN Member m ON o.uuid = m.orgId
 ORDER BY o.uuid;
+
+WITH vars AS (
+    SELECT '045B7C81-B05E-4275-B54A-2828ED335EEE' as orgId
+)
+SELECT
+    (SELECT COUNT(1) FROM IntegrationConfig WHERE orgId = vars.orgId) as configs,
+    (SELECT COUNT(1) FROM IntegrationUsageLog WHERE orgId = vars.orgId) as logs,
+    (SELECT COUNT(1) FROM Product WHERE orgId = vars.orgId) as products,
+    (SELECT COUNT(1) FROM ProductRepos WHERE orgId = vars.orgId) as "repo product links",
+    (SELECT COUNT(1) FROM SARIFInfo WHERE orgId = vars.orgId) as SARIF,
+    (SELECT COUNT(1) FROM CycloneDXInfo WHERE orgId = vars.orgId) as CycloneDX,
+    (SELECT COUNT(1) FROM SPDXInfo WHERE orgId = vars.orgId) as SPDX,
+    (SELECT COUNT(1) FROM GitBranch WHERE orgId = vars.orgId) as branches,
+    (SELECT COUNT(1) FROM GitHubApp WHERE orgId = vars.orgId) as apps,
+    (SELECT COUNT(1) FROM GitHubOAuth WHERE orgId = vars.orgId) as oauths,
+    (SELECT COUNT(1) FROM GitHubPAT WHERE orgId = vars.orgId) as tokens,
+    (SELECT COUNT(1) FROM Member WHERE orgId = vars.orgId) as members,
+    (SELECT COUNT(1) FROM `Session` WHERE orgId = vars.orgId) as "sessions",
+    (SELECT COUNT(1) FROM Finding WHERE orgId = vars.orgId) as findings
+FROM vars;
diff --git a/migrations/0024_link_repo_perms.sql b/migrations/0024_link_repo_perms.sql
index 7d4bc8a..df6e341 100644
--- a/migrations/0024_link_repo_perms.sql
+++ b/migrations/0024_link_repo_perms.sql
@@ -1,3 +1,5 @@
+PRAGMA defer_foreign_keys=ON;
+PRAGMA foreign_keys=OFF;
 CREATE TABLE "new_GitRepo" (
     "fullName" TEXT NOT NULL,
     "orgId" TEXT NOT NULL,
@@ -23,3 +25,5 @@ CREATE TABLE "new_GitRepo" (
 INSERT INTO "new_GitRepo" ("archived", "avatarUrl", "createdAt", "defaultBranch", "fork", "fullName", "ghid", "licenseName", "licenseSpdxId", "orgId", "ownerId", "pushedAt", "source", "template", "updatedAt", "visibility") SELECT "archived", "avatarUrl", "createdAt", "defaultBranch", "fork", "fullName", "ghid", "licenseName", "licenseSpdxId", "orgId", "ownerId", "pushedAt", "source", "template", "updatedAt", "visibility" FROM "GitRepo";
 DROP TABLE "GitRepo";
 ALTER TABLE "new_GitRepo" RENAME TO "GitRepo";
+PRAGMA foreign_keys=ON;
+PRAGMA defer_foreign_keys=OFF;
diff --git a/migrations/0029_orgId_tags.sql b/migrations/0029_orgId_tags.sql
new file mode 100644
index 0000000..e5f7ad2
--- /dev/null
+++ b/migrations/0029_orgId_tags.sql
@@ -0,0 +1 @@
+ALTER TABLE Tags ADD orgId TEXT NOT NULL;
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 6b32c8e..2641a1d 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -36,9 +36,10 @@ model Org {
     sarif                 SARIFInfo[]
     cdx                   CycloneDXInfo[]
     spdx                  SPDXInfo[]
-    products              Product[]
     repos                 ProductRepos[]
     branches              GitBranch[]
+    products              Product[]
+    tags                  Tags[]
     gitHubPAT             GitHubPAT[]
     gitHubApps            GitHubApp[]
     gitHubOAuth           GitHubOAuth[]
@@ -148,6 +149,8 @@ model Tags {
     uuid     String        @id @default(uuid())
     name     String
     url      String?
+    orgId    String
+    org      Org           @relation(fields: [orgId], references: [uuid])
     products ProductTags[]
 }
 
diff --git a/src b/src
index 1493d61..89688fb 160000
--- a/src
+++ b/src
@@ -1 +1 @@
-Subproject commit 1493d61aa7cd233c3441a2f3fd98ff5f1e3c3d4e
+Subproject commit 89688fbdce8740f895cb8f33758ab5c26bc5ca9d