diff --git a/infra/console.ts b/infra/console.ts
index 29e473de37..64edbb83b3 100644
--- a/infra/console.ts
+++ b/infra/console.ts
@@ -243,6 +243,11 @@ const logProcessor = new sst.cloudflare.Worker("LogProcessor", {
   link: [new sst.Secret("HONEYCOMB_API_KEY")],
 })
 
+const ph2 = new sst.Linkable("Placeholder2", {
+  properties: {
+    version: "1",
+  },
+})
 new sst.cloudflare.x.SolidStart("Console", {
   domain,
   path: "packages/console/app",
@@ -272,6 +277,8 @@ new sst.cloudflare.x.SolidStart("Console", {
           new sst.Secret("CLOUDFLARE_API_TOKEN", process.env.CLOUDFLARE_API_TOKEN!),
         ]
       : []),
+    ph2,
+    new sst.Secret("PLACEHOLDER"),
   ],
   environment: {
     //VITE_DOCS_URL: web.url.apply((url) => url!),
diff --git a/packages/console/core/sst-env.d.ts b/packages/console/core/sst-env.d.ts
index 5f1d5d56e1..301538ccb2 100644
--- a/packages/console/core/sst-env.d.ts
+++ b/packages/console/core/sst-env.d.ts
@@ -4,304 +4,7 @@
 /* deno-fmt-ignore-file */
 /* biome-ignore-all lint: auto-generated */
 
-import "sst"
-declare module "sst" {
-  export interface Resource {
-    "ADMIN_SECRET": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "AUTH_API_URL": {
-      "type": "sst.sst.Linkable"
-      "value": string
-    }
-    "AWS_SES_ACCESS_KEY_ID": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "AWS_SES_SECRET_ACCESS_KEY": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "CLOUDFLARE_API_TOKEN": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "CLOUDFLARE_DEFAULT_ACCOUNT_ID": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "Console": {
-      "type": "sst.cloudflare.SolidStart"
-      "url": string
-    }
-    "DISCORD_INCIDENT_WEBHOOK_URL": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "DISCORD_SUPPORT_BOT_TOKEN": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "DISCORD_SUPPORT_CHANNEL_ID": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "Database": {
-      "database": string
-      "host": string
-      "password": string
-      "port": number
-      "type": "sst.sst.Linkable"
-      "username": string
-    }
-    "EMAILOCTOPUS_API_KEY": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "FEISHU_APP_ID": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "FEISHU_APP_SECRET": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "GITHUB_APP_ID": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "GITHUB_APP_PRIVATE_KEY": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "GITHUB_CLIENT_ID_CONSOLE": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "GITHUB_CLIENT_SECRET_CONSOLE": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "GOOGLE_CLIENT_ID": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "HONEYCOMB_API_KEY": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "HoneycombWebhookSecret": {
-      "type": "random.index/randomPassword.RandomPassword"
-      "value": string
-    }
-    "R2AccessKey": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "R2SecretKey": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "SALESFORCE_CLIENT_ID": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "SALESFORCE_CLIENT_SECRET": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "SALESFORCE_INSTANCE_URL": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "STRIPE_PUBLISHABLE_KEY": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "STRIPE_SECRET_KEY": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "STRIPE_WEBHOOK_SECRET": {
-      "type": "sst.sst.Linkable"
-      "value": string
-    }
-    "Teams": {
-      "type": "sst.cloudflare.SolidStart"
-      "url": string
-    }
-    "Web": {
-      "type": "sst.cloudflare.Astro"
-      "url": string
-    }
-    "WebApp": {
-      "type": "sst.cloudflare.StaticSite"
-      "url": string
-    }
-    "ZEN_BLACK_PRICE": {
-      "plan100": string
-      "plan20": string
-      "plan200": string
-      "product": string
-      "type": "sst.sst.Linkable"
-    }
-    "ZEN_LIMITS": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_LITE_PRICE": {
-      "firstMonth100Coupon": string
-      "firstMonth50Coupon": string
-      "price": string
-      "priceInr": number
-      "product": string
-      "sixMonths100Coupon": string
-      "threeMonths100Coupon": string
-      "twelveMonths100Coupon": string
-      "type": "sst.sst.Linkable"
-    }
-    "ZEN_MODELS1": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS10": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS11": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS12": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS13": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS14": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS15": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS16": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS17": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS18": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS19": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS2": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS20": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS21": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS22": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS23": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS24": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS25": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS26": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS27": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS28": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS29": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS3": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS30": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS4": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS5": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS6": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS7": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS8": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS9": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_SESSION_SECRET": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-  }
-}
-// cloudflare 
-import * as cloudflare from "@cloudflare/workers-types";
-declare module "sst" {
-  export interface Resource {
-    "Api": cloudflare.Service
-    "AuthApi": cloudflare.Service
-    "AuthStorage": cloudflare.KVNamespace
-    "Bucket": cloudflare.R2Bucket
-    "EnterpriseStorage": cloudflare.R2Bucket
-    "LogProcessor": cloudflare.Service
-    "Stat": cloudflare.Service
-    "ZenData": cloudflare.R2Bucket
-    "ZenDataNew": cloudflare.R2Bucket
-  }
-}
+/// <reference path="../../../sst-env.d.ts" />
 
 import "sst"
 export {}
\ No newline at end of file
diff --git a/packages/console/function/sst-env.d.ts b/packages/console/function/sst-env.d.ts
index 5f1d5d56e1..301538ccb2 100644
--- a/packages/console/function/sst-env.d.ts
+++ b/packages/console/function/sst-env.d.ts
@@ -4,304 +4,7 @@
 /* deno-fmt-ignore-file */
 /* biome-ignore-all lint: auto-generated */
 
-import "sst"
-declare module "sst" {
-  export interface Resource {
-    "ADMIN_SECRET": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "AUTH_API_URL": {
-      "type": "sst.sst.Linkable"
-      "value": string
-    }
-    "AWS_SES_ACCESS_KEY_ID": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "AWS_SES_SECRET_ACCESS_KEY": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "CLOUDFLARE_API_TOKEN": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "CLOUDFLARE_DEFAULT_ACCOUNT_ID": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "Console": {
-      "type": "sst.cloudflare.SolidStart"
-      "url": string
-    }
-    "DISCORD_INCIDENT_WEBHOOK_URL": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "DISCORD_SUPPORT_BOT_TOKEN": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "DISCORD_SUPPORT_CHANNEL_ID": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "Database": {
-      "database": string
-      "host": string
-      "password": string
-      "port": number
-      "type": "sst.sst.Linkable"
-      "username": string
-    }
-    "EMAILOCTOPUS_API_KEY": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "FEISHU_APP_ID": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "FEISHU_APP_SECRET": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "GITHUB_APP_ID": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "GITHUB_APP_PRIVATE_KEY": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "GITHUB_CLIENT_ID_CONSOLE": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "GITHUB_CLIENT_SECRET_CONSOLE": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "GOOGLE_CLIENT_ID": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "HONEYCOMB_API_KEY": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "HoneycombWebhookSecret": {
-      "type": "random.index/randomPassword.RandomPassword"
-      "value": string
-    }
-    "R2AccessKey": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "R2SecretKey": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "SALESFORCE_CLIENT_ID": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "SALESFORCE_CLIENT_SECRET": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "SALESFORCE_INSTANCE_URL": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "STRIPE_PUBLISHABLE_KEY": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "STRIPE_SECRET_KEY": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "STRIPE_WEBHOOK_SECRET": {
-      "type": "sst.sst.Linkable"
-      "value": string
-    }
-    "Teams": {
-      "type": "sst.cloudflare.SolidStart"
-      "url": string
-    }
-    "Web": {
-      "type": "sst.cloudflare.Astro"
-      "url": string
-    }
-    "WebApp": {
-      "type": "sst.cloudflare.StaticSite"
-      "url": string
-    }
-    "ZEN_BLACK_PRICE": {
-      "plan100": string
-      "plan20": string
-      "plan200": string
-      "product": string
-      "type": "sst.sst.Linkable"
-    }
-    "ZEN_LIMITS": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_LITE_PRICE": {
-      "firstMonth100Coupon": string
-      "firstMonth50Coupon": string
-      "price": string
-      "priceInr": number
-      "product": string
-      "sixMonths100Coupon": string
-      "threeMonths100Coupon": string
-      "twelveMonths100Coupon": string
-      "type": "sst.sst.Linkable"
-    }
-    "ZEN_MODELS1": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS10": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS11": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS12": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS13": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS14": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS15": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS16": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS17": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS18": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS19": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS2": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS20": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS21": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS22": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS23": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS24": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS25": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS26": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS27": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS28": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS29": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS3": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS30": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS4": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS5": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS6": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS7": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS8": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS9": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_SESSION_SECRET": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-  }
-}
-// cloudflare 
-import * as cloudflare from "@cloudflare/workers-types";
-declare module "sst" {
-  export interface Resource {
-    "Api": cloudflare.Service
-    "AuthApi": cloudflare.Service
-    "AuthStorage": cloudflare.KVNamespace
-    "Bucket": cloudflare.R2Bucket
-    "EnterpriseStorage": cloudflare.R2Bucket
-    "LogProcessor": cloudflare.Service
-    "Stat": cloudflare.Service
-    "ZenData": cloudflare.R2Bucket
-    "ZenDataNew": cloudflare.R2Bucket
-  }
-}
+/// <reference path="../../../sst-env.d.ts" />
 
 import "sst"
 export {}
\ No newline at end of file
diff --git a/packages/console/resource/sst-env.d.ts b/packages/console/resource/sst-env.d.ts
index 5f1d5d56e1..301538ccb2 100644
--- a/packages/console/resource/sst-env.d.ts
+++ b/packages/console/resource/sst-env.d.ts
@@ -4,304 +4,7 @@
 /* deno-fmt-ignore-file */
 /* biome-ignore-all lint: auto-generated */
 
-import "sst"
-declare module "sst" {
-  export interface Resource {
-    "ADMIN_SECRET": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "AUTH_API_URL": {
-      "type": "sst.sst.Linkable"
-      "value": string
-    }
-    "AWS_SES_ACCESS_KEY_ID": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "AWS_SES_SECRET_ACCESS_KEY": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "CLOUDFLARE_API_TOKEN": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "CLOUDFLARE_DEFAULT_ACCOUNT_ID": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "Console": {
-      "type": "sst.cloudflare.SolidStart"
-      "url": string
-    }
-    "DISCORD_INCIDENT_WEBHOOK_URL": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "DISCORD_SUPPORT_BOT_TOKEN": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "DISCORD_SUPPORT_CHANNEL_ID": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "Database": {
-      "database": string
-      "host": string
-      "password": string
-      "port": number
-      "type": "sst.sst.Linkable"
-      "username": string
-    }
-    "EMAILOCTOPUS_API_KEY": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "FEISHU_APP_ID": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "FEISHU_APP_SECRET": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "GITHUB_APP_ID": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "GITHUB_APP_PRIVATE_KEY": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "GITHUB_CLIENT_ID_CONSOLE": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "GITHUB_CLIENT_SECRET_CONSOLE": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "GOOGLE_CLIENT_ID": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "HONEYCOMB_API_KEY": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "HoneycombWebhookSecret": {
-      "type": "random.index/randomPassword.RandomPassword"
-      "value": string
-    }
-    "R2AccessKey": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "R2SecretKey": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "SALESFORCE_CLIENT_ID": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "SALESFORCE_CLIENT_SECRET": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "SALESFORCE_INSTANCE_URL": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "STRIPE_PUBLISHABLE_KEY": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "STRIPE_SECRET_KEY": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "STRIPE_WEBHOOK_SECRET": {
-      "type": "sst.sst.Linkable"
-      "value": string
-    }
-    "Teams": {
-      "type": "sst.cloudflare.SolidStart"
-      "url": string
-    }
-    "Web": {
-      "type": "sst.cloudflare.Astro"
-      "url": string
-    }
-    "WebApp": {
-      "type": "sst.cloudflare.StaticSite"
-      "url": string
-    }
-    "ZEN_BLACK_PRICE": {
-      "plan100": string
-      "plan20": string
-      "plan200": string
-      "product": string
-      "type": "sst.sst.Linkable"
-    }
-    "ZEN_LIMITS": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_LITE_PRICE": {
-      "firstMonth100Coupon": string
-      "firstMonth50Coupon": string
-      "price": string
-      "priceInr": number
-      "product": string
-      "sixMonths100Coupon": string
-      "threeMonths100Coupon": string
-      "twelveMonths100Coupon": string
-      "type": "sst.sst.Linkable"
-    }
-    "ZEN_MODELS1": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS10": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS11": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS12": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS13": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS14": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS15": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS16": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS17": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS18": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS19": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS2": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS20": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS21": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS22": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS23": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS24": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS25": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS26": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS27": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS28": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS29": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS3": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS30": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS4": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS5": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS6": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS7": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS8": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS9": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_SESSION_SECRET": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-  }
-}
-// cloudflare 
-import * as cloudflare from "@cloudflare/workers-types";
-declare module "sst" {
-  export interface Resource {
-    "Api": cloudflare.Service
-    "AuthApi": cloudflare.Service
-    "AuthStorage": cloudflare.KVNamespace
-    "Bucket": cloudflare.R2Bucket
-    "EnterpriseStorage": cloudflare.R2Bucket
-    "LogProcessor": cloudflare.Service
-    "Stat": cloudflare.Service
-    "ZenData": cloudflare.R2Bucket
-    "ZenDataNew": cloudflare.R2Bucket
-  }
-}
+/// <reference path="../../../sst-env.d.ts" />
 
 import "sst"
 export {}
\ No newline at end of file
diff --git a/packages/enterprise/sst-env.d.ts b/packages/enterprise/sst-env.d.ts
index 5f1d5d56e1..64441936d7 100644
--- a/packages/enterprise/sst-env.d.ts
+++ b/packages/enterprise/sst-env.d.ts
@@ -4,304 +4,7 @@
 /* deno-fmt-ignore-file */
 /* biome-ignore-all lint: auto-generated */
 
-import "sst"
-declare module "sst" {
-  export interface Resource {
-    "ADMIN_SECRET": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "AUTH_API_URL": {
-      "type": "sst.sst.Linkable"
-      "value": string
-    }
-    "AWS_SES_ACCESS_KEY_ID": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "AWS_SES_SECRET_ACCESS_KEY": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "CLOUDFLARE_API_TOKEN": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "CLOUDFLARE_DEFAULT_ACCOUNT_ID": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "Console": {
-      "type": "sst.cloudflare.SolidStart"
-      "url": string
-    }
-    "DISCORD_INCIDENT_WEBHOOK_URL": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "DISCORD_SUPPORT_BOT_TOKEN": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "DISCORD_SUPPORT_CHANNEL_ID": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "Database": {
-      "database": string
-      "host": string
-      "password": string
-      "port": number
-      "type": "sst.sst.Linkable"
-      "username": string
-    }
-    "EMAILOCTOPUS_API_KEY": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "FEISHU_APP_ID": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "FEISHU_APP_SECRET": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "GITHUB_APP_ID": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "GITHUB_APP_PRIVATE_KEY": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "GITHUB_CLIENT_ID_CONSOLE": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "GITHUB_CLIENT_SECRET_CONSOLE": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "GOOGLE_CLIENT_ID": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "HONEYCOMB_API_KEY": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "HoneycombWebhookSecret": {
-      "type": "random.index/randomPassword.RandomPassword"
-      "value": string
-    }
-    "R2AccessKey": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "R2SecretKey": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "SALESFORCE_CLIENT_ID": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "SALESFORCE_CLIENT_SECRET": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "SALESFORCE_INSTANCE_URL": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "STRIPE_PUBLISHABLE_KEY": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "STRIPE_SECRET_KEY": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "STRIPE_WEBHOOK_SECRET": {
-      "type": "sst.sst.Linkable"
-      "value": string
-    }
-    "Teams": {
-      "type": "sst.cloudflare.SolidStart"
-      "url": string
-    }
-    "Web": {
-      "type": "sst.cloudflare.Astro"
-      "url": string
-    }
-    "WebApp": {
-      "type": "sst.cloudflare.StaticSite"
-      "url": string
-    }
-    "ZEN_BLACK_PRICE": {
-      "plan100": string
-      "plan20": string
-      "plan200": string
-      "product": string
-      "type": "sst.sst.Linkable"
-    }
-    "ZEN_LIMITS": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_LITE_PRICE": {
-      "firstMonth100Coupon": string
-      "firstMonth50Coupon": string
-      "price": string
-      "priceInr": number
-      "product": string
-      "sixMonths100Coupon": string
-      "threeMonths100Coupon": string
-      "twelveMonths100Coupon": string
-      "type": "sst.sst.Linkable"
-    }
-    "ZEN_MODELS1": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS10": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS11": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS12": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS13": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS14": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS15": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS16": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS17": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS18": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS19": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS2": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS20": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS21": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS22": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS23": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS24": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS25": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS26": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS27": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS28": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS29": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS3": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS30": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS4": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS5": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS6": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS7": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS8": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS9": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_SESSION_SECRET": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-  }
-}
-// cloudflare 
-import * as cloudflare from "@cloudflare/workers-types";
-declare module "sst" {
-  export interface Resource {
-    "Api": cloudflare.Service
-    "AuthApi": cloudflare.Service
-    "AuthStorage": cloudflare.KVNamespace
-    "Bucket": cloudflare.R2Bucket
-    "EnterpriseStorage": cloudflare.R2Bucket
-    "LogProcessor": cloudflare.Service
-    "Stat": cloudflare.Service
-    "ZenData": cloudflare.R2Bucket
-    "ZenDataNew": cloudflare.R2Bucket
-  }
-}
+/// <reference path="../../sst-env.d.ts" />
 
 import "sst"
 export {}
\ No newline at end of file
diff --git a/packages/function/sst-env.d.ts b/packages/function/sst-env.d.ts
index 5f1d5d56e1..64441936d7 100644
--- a/packages/function/sst-env.d.ts
+++ b/packages/function/sst-env.d.ts
@@ -4,304 +4,7 @@
 /* deno-fmt-ignore-file */
 /* biome-ignore-all lint: auto-generated */
 
-import "sst"
-declare module "sst" {
-  export interface Resource {
-    "ADMIN_SECRET": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "AUTH_API_URL": {
-      "type": "sst.sst.Linkable"
-      "value": string
-    }
-    "AWS_SES_ACCESS_KEY_ID": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "AWS_SES_SECRET_ACCESS_KEY": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "CLOUDFLARE_API_TOKEN": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "CLOUDFLARE_DEFAULT_ACCOUNT_ID": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "Console": {
-      "type": "sst.cloudflare.SolidStart"
-      "url": string
-    }
-    "DISCORD_INCIDENT_WEBHOOK_URL": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "DISCORD_SUPPORT_BOT_TOKEN": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "DISCORD_SUPPORT_CHANNEL_ID": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "Database": {
-      "database": string
-      "host": string
-      "password": string
-      "port": number
-      "type": "sst.sst.Linkable"
-      "username": string
-    }
-    "EMAILOCTOPUS_API_KEY": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "FEISHU_APP_ID": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "FEISHU_APP_SECRET": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "GITHUB_APP_ID": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "GITHUB_APP_PRIVATE_KEY": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "GITHUB_CLIENT_ID_CONSOLE": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "GITHUB_CLIENT_SECRET_CONSOLE": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "GOOGLE_CLIENT_ID": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "HONEYCOMB_API_KEY": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "HoneycombWebhookSecret": {
-      "type": "random.index/randomPassword.RandomPassword"
-      "value": string
-    }
-    "R2AccessKey": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "R2SecretKey": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "SALESFORCE_CLIENT_ID": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "SALESFORCE_CLIENT_SECRET": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "SALESFORCE_INSTANCE_URL": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "STRIPE_PUBLISHABLE_KEY": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "STRIPE_SECRET_KEY": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "STRIPE_WEBHOOK_SECRET": {
-      "type": "sst.sst.Linkable"
-      "value": string
-    }
-    "Teams": {
-      "type": "sst.cloudflare.SolidStart"
-      "url": string
-    }
-    "Web": {
-      "type": "sst.cloudflare.Astro"
-      "url": string
-    }
-    "WebApp": {
-      "type": "sst.cloudflare.StaticSite"
-      "url": string
-    }
-    "ZEN_BLACK_PRICE": {
-      "plan100": string
-      "plan20": string
-      "plan200": string
-      "product": string
-      "type": "sst.sst.Linkable"
-    }
-    "ZEN_LIMITS": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_LITE_PRICE": {
-      "firstMonth100Coupon": string
-      "firstMonth50Coupon": string
-      "price": string
-      "priceInr": number
-      "product": string
-      "sixMonths100Coupon": string
-      "threeMonths100Coupon": string
-      "twelveMonths100Coupon": string
-      "type": "sst.sst.Linkable"
-    }
-    "ZEN_MODELS1": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS10": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS11": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS12": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS13": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS14": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS15": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS16": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS17": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS18": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS19": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS2": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS20": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS21": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS22": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS23": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS24": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS25": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS26": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS27": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS28": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS29": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS3": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS30": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS4": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS5": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS6": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS7": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS8": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_MODELS9": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "ZEN_SESSION_SECRET": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-  }
-}
-// cloudflare 
-import * as cloudflare from "@cloudflare/workers-types";
-declare module "sst" {
-  export interface Resource {
-    "Api": cloudflare.Service
-    "AuthApi": cloudflare.Service
-    "AuthStorage": cloudflare.KVNamespace
-    "Bucket": cloudflare.R2Bucket
-    "EnterpriseStorage": cloudflare.R2Bucket
-    "LogProcessor": cloudflare.Service
-    "Stat": cloudflare.Service
-    "ZenData": cloudflare.R2Bucket
-    "ZenDataNew": cloudflare.R2Bucket
-  }
-}
+/// <reference path="../../sst-env.d.ts" />
 
 import "sst"
 export {}
\ No newline at end of file
diff --git a/sst-env.d.ts b/sst-env.d.ts
index 25319d9c46..1eaebd1e59 100644
--- a/sst-env.d.ts
+++ b/sst-env.d.ts
@@ -22,22 +22,10 @@ declare module "sst" {
       "type": "sst.sst.Secret"
       "value": string
     }
-    "Api": {
-      "type": "sst.cloudflare.Worker"
-      "url": string
-    }
-    "AuthApi": {
-      "type": "sst.cloudflare.Worker"
-      "url": string
-    }
-    "AuthStorage": {
-      "namespaceId": string
-      "type": "sst.cloudflare.Kv"
-    }
-    "Bucket": {
-      "name": string
-      "type": "sst.cloudflare.Bucket"
-    }
+    "Api": import("@cloudflare/workers-types").Service
+    "AuthApi": import("@cloudflare/workers-types").Service
+    "AuthStorage": import("@cloudflare/workers-types").KVNamespace
+    "Bucket": import("@cloudflare/workers-types").R2Bucket
     "CLOUDFLARE_API_TOKEN": {
       "type": "sst.sst.Secret"
       "value": string
@@ -74,10 +62,7 @@ declare module "sst" {
       "type": "sst.sst.Secret"
       "value": string
     }
-    "EnterpriseStorage": {
-      "name": string
-      "type": "sst.cloudflare.Bucket"
-    }
+    "EnterpriseStorage": import("@cloudflare/workers-types").R2Bucket
     "FEISHU_APP_ID": {
       "type": "sst.sst.Secret"
       "value": string
@@ -114,9 +99,7 @@ declare module "sst" {
       "type": "random.index/randomPassword.RandomPassword"
       "value": string
     }
-    "LogProcessor": {
-      "type": "sst.cloudflare.Worker"
-    }
+    "LogProcessor": import("@cloudflare/workers-types").Service
     "R2AccessKey": {
       "type": "sst.sst.Secret"
       "value": string
@@ -149,10 +132,7 @@ declare module "sst" {
       "type": "sst.sst.Linkable"
       "value": string
     }
-    "Stat": {
-      "type": "sst.cloudflare.Worker"
-      "url": string
-    }
+    "Stat": import("@cloudflare/workers-types").Service
     "Teams": {
       "type": "sst.cloudflare.SolidStart"
       "url": string
@@ -311,17 +291,10 @@ declare module "sst" {
       "type": "sst.sst.Secret"
       "value": string
     }
-    "ZenData": {
-      "name": string
-      "type": "sst.cloudflare.Bucket"
-    }
-    "ZenDataNew": {
-      "name": string
-      "type": "sst.cloudflare.Bucket"
-    }
+    "ZenData": import("@cloudflare/workers-types").R2Bucket
+    "ZenDataNew": import("@cloudflare/workers-types").R2Bucket
   }
 }
-/// <reference path="sst-env.d.ts" />
 
 import "sst"
 export {}
\ No newline at end of file