diff --git a/packages/console/app/src/routes/zen/util/handler.ts b/packages/console/app/src/routes/zen/util/handler.ts
index 4d31756161d..a92aaaea35c 100644
--- a/packages/console/app/src/routes/zen/util/handler.ts
+++ b/packages/console/app/src/routes/zen/util/handler.ts
@@ -197,7 +197,8 @@ export async function handler(
                   if (Array.isArray(v)) return [[k, v]]
                   if (typeof v === "object") return [[k, replacer(v)]]
                   if (typeof v === "string") {
-                    if (v === "$workspace") return authInfo?.workspaceID ? [[k, authInfo?.workspaceID]] : []
+                    if (v === "$workspace") return authInfo?.workspaceID ? [[k, authInfo.workspaceID]] : []
+                    if (v === "$org") return authInfo?.workspaceID ? [[k, authInfo.workspaceID.replace("wrk_", "org_")]] : []
                     if (v === "$user") return stickyId ? [[k, stickyId]] : []
                     if (v.startsWith("$header.")) {
                       const headerValue = input.request.headers.get(v.slice(8))
diff --git a/packages/console/core/src/schema/billing.sql.ts b/packages/console/core/src/schema/billing.sql.ts
index b177858f363..915646cf3da 100644
--- a/packages/console/core/src/schema/billing.sql.ts
+++ b/packages/console/core/src/schema/billing.sql.ts
@@ -53,7 +53,6 @@ export const BillingTable = mysqlTable(
     ...workspaceIndexes(table),
     uniqueIndex("global_customer_id").on(table.customerID),
     uniqueIndex("global_subscription_id").on(table.subscriptionID),
-    uniqueIndex("global_lite_subscription_id").on(table.liteSubscriptionID),
   ],
 )
 
diff --git a/packages/console/core/src/schema/referral.sql.ts b/packages/console/core/src/schema/referral.sql.ts
index be2499ee115..9850c92457d 100644
--- a/packages/console/core/src/schema/referral.sql.ts
+++ b/packages/console/core/src/schema/referral.sql.ts
@@ -1,4 +1,4 @@
-import { bigint, index, mysqlTable, primaryKey, uniqueIndex, varchar } from "drizzle-orm/mysql-core"
+import { bigint, mysqlTable, primaryKey, uniqueIndex, varchar } from "drizzle-orm/mysql-core"
 import { timestamps, ulid, utc, workspaceColumns } from "../drizzle/types"
 import { workspaceIndexes } from "./workspace.sql"
 
@@ -31,8 +31,5 @@ export const ReferralRewardTable = mysqlTable(
     amount: bigint("amount", { mode: "number" }).notNull(),
     timeApplied: utc("time_applied"),
   },
-  (table) => [
-    primaryKey({ columns: [table.workspaceID, table.referralID] }),
-    index("referral_id").on(table.referralID),
-  ],
+  (table) => [primaryKey({ columns: [table.workspaceID, table.referralID] })],
 )